Commit Graph

350 Commits

Author SHA1 Message Date
Kai Zimmermann
aab25030cf Merge branch 'master' into feature_create_repo_api 2016-06-03 12:40:04 +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
Kai Zimmermann
4bea2ae1a5 Merge remote-tracking branch 'eclipse/master' into feature_split_repo_into_api_impl 2016-06-01 09:23:43 +02:00
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
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
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
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
Melanie Retter
8e597203ae Correct Typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 13:49:15 +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
Kai Zimmermann
eeee57fbc4 Refactored package names.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-26 14:03:14 +02:00
Kai Zimmermann
f2e13b8d22 Split into separate maven modules.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-25 17:43:57 +02:00
Michael Hirsch
7b20122f09 Merge pull request #189 from bsinno/fix_widgetset_clean_recompilation
move widgetset to src/main/resources and remove cleaning of widgeset
2016-05-25 12:22:46 +02:00
Kai Zimmermann
cf450dabfa Merge remote-tracking branch 'eclipse/master' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-24 21:51:59 +02:00
Kai Zimmermann
608ffcecf4 Merge pull request #162 from bsinno/fix_create_filter_has_different_layout_than_rollout_and_the_other_widgets
Create filter has different layout than rollout and the other widgets
2016-05-24 18:08:09 +02:00
Kai Zimmermann
d59ebaebd8 Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
Feature/add rest api with java client
2016-05-24 16:11:25 +02:00
Asharani
693c678377 Do not log the exception trace when upload fails by user abort action
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-24 14:38:06 +05:30
Kai Zimmermann
f0a78369f2 Continued on the model API extraction. Merged rest api split branch.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-21 21:01:23 +02:00
Kai Zimmermann
8b7b24125f Merge remote-tracking branch
'origin/Feature/Add_Rest_Api_with_Java_client' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-20 17:42:55 +02:00
Michael Hirsch
1fa335dedd fix license header in pom file
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-20 15:35:15 +02:00
Michael Hirsch
47e254e14e move widgetset to src/main/resources and remove cleaning of widgeset
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-20 13:56:36 +02:00
Asharani
037e66e197 Allowe parallel uploads of same file for different software module.
Display software module details in status popup.

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-20 15:48:38 +05:30
Michael Hirsch
355218f7b7 Merge pull request #185 from bsinno/fix_flashing_whitepage_on_login_application
fix_flashing_whitepage_on_login_application
2016-05-19 14:02:28 +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
Kai Zimmermann
3e5330a5e6 Completed management separation.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-19 11:16:26 +02:00
Asharani
c2bf9222b7 Signed-off-by: Asharani <Asharani.Murugesh@in.bosch.com> 2016-05-19 10:51:12 +05:30
Kai Zimmermann
3c0d5396b0 Removed default implementations as JaCoCo has problems with those. Split
software management.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 16:16:30 +02:00
SirWayne
96af492a9c Fix NPE in equals
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 15:02:49 +02:00
SirWayne
5bb24c78ad Remove and Rename modules
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 13:48:04 +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
venu1278
f1daaa9bbd Merge branch 'master' into fix_display_DSNameVersion_actionhistory_table 2016-05-18 14:09:07 +05:30
venu1278
40fa1325bd fix_display_DSNameVersion_actionhistory_table.
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-18 14:07:52 +05:30
Asharani
a774412055 Bug fix : During upload the files when changing the selection of the
software module the upload also changes to the new selected software
module

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-18 11:14:51 +05:30
Asharani
51db4204d2 Bug fix :- During upload the files when changing the selection of the
software module the upload also changes to the new selected software
module

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 17:50:40 +05:30
Asharani
652f480667 Added liscense header
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 15:01:12 +05:30
Asharani
0073fdeb40 Added comments .Removed changes not required.
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 12:48:47 +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
Michael Hirsch
5eeac5cb38 remove create breadcumb comment 2016-05-17 08:37:04 +02:00
Asharani
87da60b950 Merge branch 'master' into Minimize_maximize_status_popup 2016-05-16 16:33:04 +05:30
Asharani
eadff47f24 Artifact upload : on discard action interupt the ongoing upload -
reverted the changes

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-16 16:26:24 +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
Kai Zimmermann
6654d71969 Started with #100 by means of splitting the management services into API
and Jpa implementation.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-13 08:44:34 +02:00