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

515 Commits

Author SHA1 Message Date
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
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
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
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
Gaurav
f964f7c0c6 Formatted the code 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-04 17:58:29 +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
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
Melanie Retter
b8bc46d299 Add JavaDoc 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-01 15:34:00 +02:00
Melanie Retter
c0a3a44277 Delete displayError in UiNotification 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-01 13:40:40 +02:00
Melanie Retter
26c376e22e Refactor HawkbitNotificationMessage 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-01 10:13:45 +02:00
Melanie Retter
27019b9e4c Beautify error notification. 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-29 16:23:43 +02:00
Michael Hirsch
7a32d931b5 improve code quality 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 17:12:56 +02:00
Michael Hirsch
5ae190c8c3 improve code quality 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 17:11:04 +02:00
Michael Hirsch
2ad6f6946f improve code quality 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 16:19:14 +02:00
Gaurav
b919dd7146 Fix for the selenium testcase failure 2016-07-25 15:52:27 +02:00
Gaurav
b97f787a8a Formatted the code 2016-07-25 14:39:51 +02:00
Gaurav
e2d435b68c Merge branch 'master' into feature_multiunassignment_soft_mod 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
 2016-07-25 14:05:18 +02:00
Michael Hirsch
b7ca552c2f Merge branch 'master' into Feature_Improve_Code_Quality 2016-07-25 13:36:18 +02:00
Michael Hirsch
ebf2c15da9 use private method getEntityFactory() 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 12:07:35 +02:00
Michael Hirsch
400c8bafcf move method to the right inner class 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 11:10:59 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality 
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 10:08:24 +02:00
GAH6KOR
79823b2930 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-20 11:01:15 +02:00
gah6kor
85e22da7a2 Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
 2016-07-19 16:38:52 +02:00
Kai Zimmermann
ba177f77c0 Merge pull request #222 from bsinno/Fix_Consistent_context_menu_on_tables 
Fix consistent context menu on tables
 2016-07-19 14:50:02 +02:00
gah6kor
39a2e3ab20 Removed the discard and maximize buttons 2016-07-19 12:42:16 +02:00
gah6kor
a87a219540 Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
 2016-07-18 18:10:09 +02:00
gah6kor
63884c9fcd Formatted the code 2016-07-18 16:15:30 +02:00
gah6kor
863e340067 Formatted the code 2016-07-18 16:01:49 +02:00
gah6kor
8200ca6da1 Formatted the code 2016-07-18 15:58:05 +02:00
gah6kor
56616be58d Formatted the code 2016-07-18 15:08:11 +02:00
gah6kor
1cef0b4d46 Fix for the max assignments. 2016-07-18 15:04:41 +02:00
gah6kor
205de032e1 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-18 11:17:56 +02:00
gah6kor
ed830dd728 Formatted the code 2016-07-18 11:16:56 +02:00
Kai Zimmermann
60efc6eedc Merge pull request #243 from bsinno/fix_button_color 
Correct colour of cancel/save button in DialogWindows
 2016-07-18 10:39:22 +02:00
Melanie Retter
40f58e4b3a Refactor methodname and method call order 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 17:46:54 +02:00
Melanie Retter
9890a1d018 Insert space between buttons and window bottom 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 17:39:51 +02:00
Melanie Retter
bcc526e891 Add colored style to action buttons 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 16:47:02 +02:00
Melanie Retter
c8f307cf33 Correct the button's style on rollout view 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 16:25:02 +02:00
gah6kor
86427acd5f Adding the missing header 2016-07-15 16:07:02 +02:00
gah6kor
bdf28f75bf Merge branch 'master' into feature_ui_metadata 2016-07-15 14:42:37 +02:00
gah6kor
db753b5c3d Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/resources/messages_en.properties
	
Resolved the conflicts.
 2016-07-15 14:40:55 +02:00
Melanie Retter
0244c1ded1 Force quit is disabled if action is not forced but is canceled 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 13:34:39 +02:00
Melanie Retter
ef76488a53 Changed class name, and refactored the style logic (set / add style) 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 12:37:28 +02:00
gah6kor
b117fb0657 Fix for jenkins build failure 2016-07-14 17:44:43 +02:00