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

479 Commits

Author SHA1 Message Date
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
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
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
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
Melanie Retter
67ee674d41 Fix Update bug of softwareModuleType, refactored based on git comments 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-30 17:48:58 +02:00
venu1278
fa2e801e76 RolloutView_update_automaticaly_changes_in_repository 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-06-30 14:50:20 +05:30
Melanie Retter
f79073a15e Save button is only enabled if validation is successful 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-29 19:16:17 +02:00
SirWayne
9ce6e43b87 Set value if rollout is edited 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-28 17:49:16 +02:00
SirWayne
7e32cbd21c Add table items comparison to enable save button 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-28 17:38:21 +02:00
SirWayne
7723c30ce4 Fix window open issues and set values when a entity is selected 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-28 16:25:50 +02:00
SirWayne
4fdeb1661a Add require textfielder to rollouts and remove colorpicker 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-28 15:02:36 +02:00
SirWayne
ad4c89e8a0 Merge branch 
'fix_Introduce_consitent_button_icon_for_update_create_dialogs' of
https://github.com/bsinno/hawkbit.git into
fix_Introduce_consitent_button_icon_for_update_create_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-28 14:40:52 +02:00
SirWayne
63cf97f6b4 Refactor 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-27 17:02:44 +02:00
Melanie Retter
1436aae22a code review improvements 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-27 15:56:50 +02:00
Melanie Retter
6692f92c61 delete unused method 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-27 12:33:07 +02:00
Melanie Retter
02e2f67193 Merge remote-tracking branch 'origin/master' into fix_Introduce_consitent_button_icon_for_update_create_dialogs 2016-06-27 10:16:34 +02:00
AMU7KOR
22076aba8a Details : Disable 'manage metadata' icon when no row is selected 
Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-27 11:36:54 +05:30
AMU7KOR
f20140fbd5 Fixed compilation issue 
Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-27 11:30:02 +05:30
Melanie Retter
850b7c6828 fix enable save button problem when update 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-24 17:26:57 +02:00
Dennis Melzer
1e8ffb8b9e Update messages_en.properties 
Add properties

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-24 15:55:04 +02:00
Dennis Melzer
2c0c0d123c Update messages.properties 
Add properties

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-24 15:54:27 +02:00
AMU7KOR
e5d4e7c560 Added permission check for create/update metadata 
Added 'cancel' button in metadata popup
Added show 'metadata' icon next to 'edit' icon

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java

Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-24 15:19:40 +02:00
AMU7KOR
a53a6c9f0c Added permission check for create/update metadata 
Added 'cancel' button in metadata popup
Added show 'metadata' icon next to 'edit' icon

Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-24 15:15:20 +02:00
Kai Zimmermann
176e2d52c1 Metadata management for SM and DS in Management UI. 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-24 15:14:14 +02:00
Kai Zimmermann
796d3dda9c Metadata management for SM and DS in Management UI. 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-24 15:13:27 +02:00
Michael Hirsch
ef01a25750 javadoc first sentence missing dot 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 07:43:02 +02:00
SirWayne
3e4b866014 remove centeralign style from join column 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 17:41:44 +02:00
SirWayne
d0ad5ee0e4 Add id for soft action group button 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 16:11:48 +02:00
SirWayne
8e57eb6d26 Add action column for action history table and remove context menu 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 14:49:47 +02:00
Melanie Retter
a9ebb763f6 Add i18n to CommonDialogWindow constructor 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-23 11:25:32 +02:00