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

384 Commits

Author SHA1 Message Date
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
8e17400d93 ControllerID is focused when opening the configure target dialog 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 16:54:38 +02:00
Melanie Retter
c7ab3fe06d ColorPicker closes when second click on previewButton 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 16:49:03 +02:00
Melanie Retter
8ae8696dfa remove maximize button 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 13:40:24 +02:00
Kai Zimmermann
ec25f2961e Merge pull request #201 from bsinno/feature_remote_ip_tracking_config 
Make DDI remote IP tracking configurable
 2016-06-08 21:11:04 +02:00
SirWayne
1392798bf7 Fix some small clean code issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-08 10:54:29 +02:00
Kai Zimmermann
2fc74329c6 Merge pull request #202 from bsinno/fix_Improve_space_usage_for_tag_type_names 
Fix improve space usage for tag type names
 2016-06-07 15:36:10 +02:00
Melanie Retter
c6f595edf9 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/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 14:36:28 +02:00
Melanie Retter
023bcf6876 delete duplicate style assignment 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 12:41:57 +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
ddc6580d04 Correct component's IDs 
Correct ID save/cancel button

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Correct IDs

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Change button naming, fix selenium tests

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Fix selenium test

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 09:22:16 +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
Kai Zimmermann
44aaaab4e2 Fixed sonar issues and changes package of test repo classes for easier 
sonar exclusion.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-04 22:07:26 +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
51ab973e6b fix sonar rule replace lambda with a method reference 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-03 13:41:29 +02:00
Melanie Retter
d5602cffc3 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/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
	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/management/targettable/TargetBulkUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-03 12:54:44 +02:00
Kai Zimmermann
aab25030cf Merge branch 'master' into feature_create_repo_api 2016-06-03 12:40:04 +02:00
Melanie Retter
70f18914f7 remove empty javadoc lines 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-03 11:17:45 +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
AMU7KOR
223e0f6c85 Fix: Interupt upload if software moudle is not selected 
Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-03 10:02:50 +05:30
Asharani
1fe267c5c3 Re-added component id's in SPUIComponenetIdProvider 
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
 2016-06-02 15:50:29 +05:30
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
Kai Zimmermann
e3156b195d Merge remote-tracking branch 'eclipse/master' into feature_split_repo_into_api_impl 2016-06-02 08:52:38 +02:00
Michael Hirsch
1b4058850f Merge pull request #194 from bsinno/feature_loginview_url_credentials 
Feature loginview url credentials
 2016-06-01 16:03:38 +02:00
Michael Hirsch
4ffedd44f6 Merge pull request #196 from bsinno/NPE_on_UI_when_clicking_target 
NPE on ui when clicking target
 2016-06-01 15:46:40 +02:00
Kai Zimmermann
615cbe2308 Added null check for selected target 2016-06-01 13:17:40 +02:00
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
f26d240f38 Reverting commit d3f7b9d - on behalf of venu 
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
 2016-06-01 11:17:50 +05:30
Asharani
2b58fe96a6 Merge branch 
'fix_introduce_consistent_button_position_in_change_dialogs' of
https://github.com/bsinno/hawkbit into
fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
 2016-06-01 10:57:07 +05:30
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
Kai Zimmermann
13f9791891 Removed JPA dependencies from runtime. Test only now. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-31 20:50:22 +02:00
Melanie Retter
f41e55b92d Added IDs for save and cancel button 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-31 16:29:52 +02:00
Michael Hirsch
3e6930419e refactor code 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 15:43:49 +02:00
Asharani
c5541b42dc Added null check for address host 
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
 2016-05-31 17:45:24 +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
SirWayne
b14d3bbd3c Small fixes 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-31 10:50:09 +02:00
Kai Zimmermann
7a98c58407 refactored test data generation. Refactored entity factor methods. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-31 08:51:49 +02:00
Melanie Retter
2dfda701b5 add license text 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-30 18:26:52 +02:00
Melanie Retter
f1533a7f1e 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-05-30 17:50:19 +02:00
Melanie Retter
0b1782e946 add default value for optionGroup; optimize UI 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-30 17:50:03 +02:00
Michael Hirsch
fc5a22302b read credentials from URL path to add to the textfield directly 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-30 15:00:11 +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
Melanie Retter
8e597203ae Correct Typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-30 13:49:15 +02:00
Melanie Retter
6fd24416ae substitute VerticalLayout for FormLayout 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-05-30 12:37:39 +02:00
Melanie Retter
2d474c17ee Merge remote-tracking branch 'origin/master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-30 12:35:12 +02:00
Kai Zimmermann
a4e0fc2457 Fixed a broken query. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-27 16:04:37 +02:00
Kai Zimmermann
53156cb16f Javadoc, sonar issue, package cycles. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-27 15:25:08 +02:00