Commit Graph

313 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Kai Zimmermann
d30eef7e6d Sonar false positive added for hidden exception.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:18:29 +02:00
Kai Zimmermann
882c689a51 Migrated sonar false positives from qube into code.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:13:26 +02:00
Melanie Retter
c4f368ee40 float values - capital F
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-03 16:11:02 +02:00
Melanie Retter
a4832c5bcd Style improvement
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-03 14:48:09 +02:00
SirWayne
f33c8c05e2 Add download server api
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-03 12:52:53 +02:00
venu1278
1438d3ef2b displaying assigned installed ds tooltip in Deployment View
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-02 15:32:40 +05:30
Michael Hirsch
a946f51da4 fix installed and assigned distribution set setting on the proxy target
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 12:57:25 +02:00
Michael Hirsch
59bec04c58 add null check for distribution set
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-29 12:52:27 +02:00
venu1278
8e2ea76c8c fix_assigned_installed_ds_tooltip_gliches
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-29 16:10:10 +05:30
Michael Hirsch
ae5c083733 Merge pull request #151 from bsinno/Displaying-DistributionSet-Details-Tooltip
Displaying DistributionSet Details in Tooltip
2016-04-28 17:11:37 +02:00
Michael Hirsch
e899a3553f Merge pull request #156 from bsinno/Bug/Show_User_Information
Fix: Return trimmed username
2016-04-28 16:47:17 +02:00
SirWayne
345e9a7cf3 Rename method
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-28 16:24:13 +02:00
Michael Hirsch
f203e31d00 use constants for html tags used often
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-28 16:20:13 +02:00
SirWayne
8dcfc8412d Fix: Return trimmed username
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-28 16:05:37 +02:00
venu1278
d8d026e9a1 Displaying DistributionSet Details in Tooltip
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-28 15:17:01 +05:30
venu1278
63d6448432 Displaying DistributionSet Details in Tooltip
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-28 11:55:48 +05:30
venu1278
ad2e9a60f6 Merge branch 'master' into MECS-794-Display-DS-Details-Tooltip 2016-04-28 11:48:16 +05:30
Kai Zimmermann
610774b64f Merge pull request #152 from bsinno/Focus-On-TextArea-AddNewWindow
Focus-TextArea-On-AddNewWindow
2016-04-27 17:29:42 +02:00
venu1278
d83b0751ca Merge branch 'master' into MECS-794-Display-DS-Details-Tooltip
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
2016-04-27 18:51:26 +05:30