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

84 Commits

Author SHA1 Message Date
Dominik Herbst
03e2ee81b8 Added auto assign distribution set to target filter query feature 
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
 2016-09-23 10:41:33 +02:00
SirWayne
aa5e4d0601 - Fix ds assignment result 
- Fix drag and drop to assignment

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-15 17:57:52 +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
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
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
8200ca6da1 Formatted the code 2016-07-18 15:58:05 +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
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
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
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
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
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
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
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
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
f567461993 correct save button enabled when changes exists. Changed lower/uppercase 
spelling

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-23 09:33:43 +02:00
SirWayne
15aa489273 Add action column in table 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-22 17:15:05 +02:00
Melanie Retter
8507626b69 Delete useless css styles. Update upper/lower case in properties 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-21 13:41:06 +02:00
Melanie Retter
66360721e6 CSS change 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-21 11:09:54 +02:00
Melanie Retter
781a987f6e Merge remote-tracking branch 'origin/master' into 
fix_Introduce_consitent_button_icon_for_update_create_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-20 15:45:24 +02:00
Melanie Retter
dbdf3c7ab4 Merge remote-tracking branch 'origin/master' into 
fix_Consitent_table_muliselect

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-10 10:53:50 +02:00
Melanie Retter
72940d854a Optimize layout Configure new Rollout 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-10 09:40:05 +02:00
Melanie Retter
5eee32ecc9 Merge remote-tracking branch 'origin/master' into 
fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 17:06:19 +02:00
Melanie Retter
1047219ad2 STRG+A for selecting all table rows, remove contextMenu, remove empty 
lines

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-08 13:02:29 +02:00
Melanie Retter
158a198cf4 Changed padding left/right of Simple Filter tags 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 11:28:10 +02:00
Melanie Retter
909a809b4b Improve padding on the left side 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 18:57:39 +02:00
Melanie Retter
739f3eb012 correct css 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 12:40:55 +02:00
Melanie Retter
c8ff0d2253 change padding 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-03 18:42:36 +02:00
Melanie Retter
7d8609b7df Merge remote-tracking branch 'origin/master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-06-03 13:50:14 +02:00
Melanie Retter
6c725efd70 Code review, correct font-size of close/minimize button of 
commonDialogWindow

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-03 09:49:36 +02:00
Asharani
f06cfa46f2 Merge branch 'master' into feature_minimize_status_popup 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGridLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
 2016-06-02 15:41:16 +05:30
Melanie Retter
40c7b6f0f7 Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs 2016-06-01 10:33:46 +02:00
Melanie Retter
5208aa2dea change color save/cancel buttons 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-01 10:33:28 +02:00
Asharani
3b04512224 Reverting commit on behalf of Venu 
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
 2016-06-01 10:46:38 +05:30
Melanie Retter
cf64d2ffdf css style change 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-31 10:53:07 +02:00
venu1278
d3f7b9de9c Displaying Metadata details of DistributionSet & SoftwareModule 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-05-30 17:57:40 +05:30
venu1278
f1a1538177 Merge branch 'master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-26 12:06:12 +05:30
Melanie Retter
96baddeaee optimize commonDialogWindow. 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-24 17:21:51 +02:00
Melanie Retter
61a53d874a Optimize 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-20 11:01:09 +02:00
venu1278
f345d5068f fix_flashing_whitepage_on_login_application 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-05-19 15:56:19 +05:30
Asharani
c2bf9222b7 Signed-off-by: Asharani <Asharani.Murugesh@in.bosch.com> 2016-05-19 10:51:12 +05:30
Melanie Retter
a10506f94b Implementing commonDialogWindow 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-18 15:15:32 +02:00
venu1278
b8936409fe fix_flashing_whitepage_on_login_application 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-05-18 14:17:29 +05:30
Michael Hirsch
885da8764c Merge pull request #166 from bsinno/fix_Consitent_breadcrumb_usage 
Consistent breadcrumb usage
 2016-05-17 08:37:32 +02:00
Asharani
87da60b950 Merge branch 'master' into Minimize_maximize_status_popup 2016-05-16 16:33:04 +05:30
Asharani
cb81c78b69 Artifact upload : on discard action interupt the ongoing upload 
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
 2016-05-16 14:56:23 +05:30
Melanie Retter
3ea1278239 Merge branch 'master' into 
fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-13 09:45:44 +02:00
Melanie Retter
f4a85c8271 Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com> 2016-05-12 11:03:21 +02:00