lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,389 Commits 1 Branch 0 Tags
ff39ecfc753432c8653b1b8f8d51a4bddb050b03
Commit Graph

1389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melanie Retter
ff39ecfc75 Correct typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 14:15:19 +02:00
Melanie Retter
6205126279 Lock is only needed when BulkUpload 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:54:28 +02:00
Melanie Retter
3ec569f259 Merge branch 'fix_lock_session_on_show_error_notification' of 
https://github.com/bsinno/hawkbit.git into
fix_lock_session_on_show_error_notification

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:29:31 +02:00
Melanie Retter
9cc63ce128 Refactor UI Error Handler. Need to put UI in constructor. So the message 
is shown in the same browser window.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:25:24 +02:00
Michael Hirsch
7f156f05a4 Merge pull request #268 from bsinno/fix_json_creator_ddideploymentbase 
add json-creator to DdiDeploymentBase
 2016-08-10 14:42:12 +02:00
Michael Hirsch
b53f4fc74f add json-creator to DdiDeploymentBase 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-10 14:42:03 +02:00
Michael Hirsch
913692f947 lock session on error showing error notification 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-10 09:22:57 +02:00
Michael Hirsch
785dc5f208 Merge pull request #266 from bsinno/Feature_Improve_Code_Quality 
Improve code quality
 2016-08-10 08:07:51 +02:00
Michael Hirsch
8c39fc98e0 Merge branch 'master' into Feature_Improve_Code_Quality 2016-08-09 17:54:11 +02:00
Michael Hirsch
4baf8c6ce0 Merge pull request #267 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
Fix concurrency on ui causes nullpointer exception
 2016-08-09 11:51:14 +02:00
Michael Hirsch
df315bb42c remove tagToken from map 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-09 11:50:59 +02:00
Michael Hirsch
9cb1fe170b clear tagDetails in BulkUpload 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-09 11:50:18 +02:00
Dominic Schabel
d3edcb0044 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
 2016-08-09 09:02:33 +02:00
Michael Hirsch
c4c205ea27 Merge pull request #262 from bsinno/fix_enable_showing_errors_during_bulk_upload 
Fix enable showing errors during bulk upload
 2016-08-08 16:47:43 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
 2016-08-08 16:40:00 +02:00
Michael Hirsch
f4c642b401 Merge pull request #265 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
clear the tagDetails map as well
 2016-08-08 16:21:17 +02:00
Jonathan Philip Knoblauch
8a1207337b Changed buildNotification method that error log dosn't have to be displayed in all cases 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-08 16:15:55 +02:00
Michael Hirsch
adafaa9489 clear the tagDetails map as well 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-08 16:15:15 +02:00
Michael Hirsch
c4b0bdfa86 Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
 2016-08-08 08:49:21 +02:00
Michael Hirsch
d53517a0c9 Merge pull request #263 from bsinno/fix_entity_lock_exception_for_unassign_soft_module_from_DS 
Fix entity lock exception for unassign soft module from ds
 2016-08-08 08:46:39 +02:00
Michael Hirsch
06b361ea3c Merge pull request #261 from bsinno/fix_systemmanagement_security_annotation 
Fix systemmanagement security annotation
 2016-08-08 08:34:09 +02:00
SirWayne
9febe16453 Fix sonar issue 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 16:42:09 +02:00
Gaurav
88c1253f66 Fix for the concurrency issue on UI causes on the Nullpointer Exception. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-05 16:02:20 +02:00
SirWayne
5f20066cff Fix sonar issue 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 15:55:49 +02:00
SirWayne
c71cf4852a fix sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 14:58:17 +02:00
SirWayne
59490d80cd Fix sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 14:26:32 +02:00
Dominic Schabel
222f06d9bb JavaDoc comments added and method visibility raised to public 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-05 14:12:27 +02:00
Jonathan Philip Knoblauch
f3f9dbc665 Added method to sync after upload 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-05 13:50:46 +02:00
Michael Hirsch
431143133b fix license header 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-05 13:19:29 +02:00
Michael Hirsch
1e00439f3c add new line 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-05 13:13:46 +02:00
Michael Hirsch
cf0ed6d828 remove guava from test dependencies 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-05 13:09:24 +02:00
Michael Hirsch
06f64da6d5 refactor test using ClassPath from guava 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-05 13:04:56 +02:00
Jonathan Philip Knoblauch
89605b0984 Changed error and how it is connected to current page 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-05 12:42:03 +02:00
SirWayne
41e7c16713 Fix criticals sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 11:29:14 +02:00
SirWayne
88e5bdf8f4 Fix criticals sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 10:51:11 +02:00
Gaurav
9bd47a5c55 Added the message in the message.properties. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-05 10:49:24 +02:00
SirWayne
54ce3ad8e0 Fix sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 08:56:38 +02:00
Gaurav
9de4a8de69 Merge branch 
'fix_entity_lock_exception_for_unassign_soft_module_from_DS' of
https://github.com/bsinno/hawkbit/ into
fix_entity_lock_exception_for_unassign_soft_module_from_DS


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-04 18:00:10 +02:00
Gaurav
f964f7c0c6 Formatted the code 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-04 17:58:29 +02:00
Gaurav
582ac22678 Formatted the code 2016-08-04 17:44:13 +02:00
Gaurav
303a668f16 Fix for the entity lock exception for unassign soft module from DS 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-04 17:36:28 +02:00
Jonathan Philip Knoblauch
709ea990df Removed component that was not needed 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-04 16:19:35 +02:00
SirWayne
a1e939e233 Merge remote-tracking branch 'eclipse/master' into 
Feature_Improve_Code_Quality

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-04 16:04:35 +02:00
Jonathan Philip Knoblauch
11bb282699 Refactoring for button enable 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-04 15:57:20 +02:00
Jonathan Philip Knoblauch
6be3d72a5a changed connector for error 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-04 13:57:06 +02:00
Michael Hirsch
f5d9cf19bb return type is not used, method can be void 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-04 13:30:53 +02:00
Michael Hirsch
b1b9716cc5 refactor test code 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-04 12:41:13 +02:00
Michael Hirsch
038538f89a extract to meanful method 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-04 12:26:28 +02:00
Jonathan Philip Knoblauch
cad916c1d7 Refactoring of bulk upload 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-04 10:04:08 +02:00
Michael Hirsch
a12b10cd14 fix license header 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-04 08:51:30 +02:00