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

506 Commits

Author SHA1 Message Date
Gaurav
0854d023fb Fixed the code for the create ds for deployment view and fixed the issue 
for delete metadata(getting optimistic lock exception)
 2016-08-02 18:32:44 +02:00
Gaurav
fa3b5d69e9 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-01 17:25:19 +02:00
Gaurav
1d72257b9f Merge branch 'feature_enable_push_in_deployment_view' of 
https://github.com/bsinno/hawkbit/ into
feature_enable_push_in_deployment_view

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
 2016-08-01 16:11:11 +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
Michael Hirsch
9c442967f8 add tests for repository entity events 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-01 15:14:40 +02:00
Gaurav
60cc2c333c Refactored the code for displaying distributions in the deployment view. 2016-08-01 15:12:03 +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
Gaurav
f2853e6d9f Resolved the conflicts 2016-07-28 14:24:49 +02:00
Gaurav
dd79829b6b Merge branch 'master' into feature_enable_push_in_deployment_view 
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
 2016-07-28 14:19:31 +02:00
Gaurav
bf28a8dde8 Fixed the issue for metadata not getting updated and also the refresh of 
page not displaying the distribution details in deployment and
distribution view.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-07-28 14:07:19 +02:00
GAH6KOR
5bc4b04039 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-26 10:16:44 +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
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
gah6kor
8e98b5a8e2 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-19 16:12:01 +02:00
gah6kor
01d2cc8422 Merge branch 'master' into feature_enable_push_in_deployment_view 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
 2016-07-19 16:09:47 +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
Melanie Retter
d87aaf2141 Delete css style for default-color 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-14 14:48:50 +02:00
Melanie Retter
1ff13a39df Correct colour of cance/save button in CommonDialogWindow 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-14 14:28:23 +02:00
gah6kor
f18a7f6d75 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-14 13:31:28 +02:00
gah6kor
e67a466b2c Addded multi unassign buttons for the software modules. 2016-07-14 13:27:45 +02:00
Melanie Retter
48561b2028 Merge remote-tracking branch 'origin/master' into 
Fix_Consistent_context_menu_on_tables

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-13 18:07:50 +02:00
Jonathan Philip Knoblauch
7be2eea2db Changed if statement of how we distinguish if a softwareModule type is a firmware or a software 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-07-13 16:55:10 +02:00
Michael Hirsch
2f9a9b456d fix sonar critical issues 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-13 08:41:59 +02:00
Kai Zimmermann
a87519fb84 Merge pull request #234 from bsinno/feture_RolloutView_update_automatically_changes_with_repository 
RolloutView_update_automaticaly_changes_in_repository
 2016-07-07 13:11:12 +02:00
Melanie Retter
11f9b6737e Added Ids for components 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-30 18:06:08 +02:00