Commit Graph

332 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Asharani
c2bf9222b7 Signed-off-by: Asharani <Asharani.Murugesh@in.bosch.com> 2016-05-19 10:51:12 +05:30
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
Asharani
8fc1f74f80 Refactored UploadHandler.java to update upload status using eventing
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-12 15:16:41 +05:30
Melanie Retter
613a3f7257 Merge remote-tracking branch 'origin/master' into
fix_reflect_tag_color_change_immediatly_after_popup_is_closed

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


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-11 11:13:16 +02:00
Michael Hirsch
cd96916d67 Merge pull request #163 from bsinno/fix_filter_icon_not_centered
Filter icon (succes/error) not centered
2016-05-11 09:15:16 +02:00
Melanie Retter
f89b7e4beb Update AbstractTableDetailsLayout.java
use capital F for float value
2016-05-10 10:24:53 +02:00
Melanie Retter
7d81054d4c remove methods and use the constant name.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-10 10:21:40 +02:00
Melanie Retter
cbcbe571ea Delete the eventbus call and add the used event to the
hawkbitEventProvider

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-09 17:02:12 +02:00
Asharani
887536b2b7 Upload confirmation popup - on discard remove the upload status button
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-09 10:42:23 +05:30
Asharani
68ab2eb30e Set error message from exception
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-06 10:28:50 +05:30
Asharani
8a976cabad Minimize/Maximize upload status popup intial commit
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-05 16:28:12 +05:30
Kai Zimmermann
a32f31c789 Merge branch 'master' into fix_NplusOne_query_on_ui
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 20:16:26 +02:00
Kai Zimmermann
bb0146fab6 Disabled DS columns in target tables. An removed N+1 also from filter
target table.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 20:00:02 +02:00
Kai Zimmermann
dc0c845793 Removed N+1 query that came in with the tooltip pull request.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 18:59:42 +02:00
Melanie Retter
653eb2de43 review pull request
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-04 17:31:46 +02:00
Kai Zimmermann
94085d834f Merge pull request #160 from bsinno/display_assigned_installed_ds_tooltip_deployment_view
Display assigned installed ds tooltip deployment view
2016-05-04 16:59:02 +02:00
Melanie Retter
55c59824fc Correct a typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-04 15:58:53 +02:00
Dennis Melzer
c73e4a94a0 Update DashboardMenu.java
float values - capital F

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-04 15:49:35 +02:00
Melanie Retter
e206b8e05a Merge remote-tracking branch 'origin/master' into fix_Consitent_breadcrumb_usage 2016-05-04 13:41:42 +02:00
Melanie Retter
36e9746ae2 Improvement of breadcrumb target filter management.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-04 13:33:29 +02:00