Commit Graph

757 Commits

Author SHA1 Message Date
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
fe1e2f74e7 exclude compiled vaadin widgetset from license check
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-20 14:25:03 +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
Michael Hirsch
88dc9cac3d Merge pull request #186 from bsinno/fix_device_simulator_ui_npe
the column name must be the same as the bean attribute name otherwise NPE
2016-05-18 15:37:01 +02:00
Michael Hirsch
b58ba74565 the column name must be the same as the bean attribute name otherwise
NPE

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-18 12:45:09 +02:00
Michael Hirsch
e27bc5b32f Merge pull request #175 from bsinno/fix_target_security_permission_check_for_system_code
allow the getTargetSecurityToken can be called as system code
2016-05-17 17:01:50 +02:00
Michael Hirsch
56487ad1b7 remove if-statement and return immediately the instanceof result
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 10:57:08 +02:00
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
Michael Hirsch
dcbf27e3ed add junit tests to security of getTargetSecurityToken
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 08:04:33 +02:00
Michael Hirsch
7a281a8236 allow the getTargetSecurityToken can be called as system code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-13 15:38:52 +02:00
Michael Hirsch
27ffb4c4a7 Merge pull request #172 from bsinno/fix_actionlogentry_add_mysql_profile
Fix actionlogentry add mysql profile
2016-05-13 09:30:55 +02:00
Michael Hirsch
33a4ed1175 fix typo of MariaDB 2016-05-13 09:30:22 +02:00
Kai Zimmermann
8b7f24e202 Add mysql profile 2016-05-12 11:58:16 +02:00
Kai Zimmermann
2c49fc8f77 Fix action message. 2016-05-12 11:55:25 +02:00
Michael Hirsch
02e2608b40 Merge pull request #164 from bsinno/fix_reflect_tag_color_change_immediatly_after_popup_is_closed
Reflect tag colour change immediatly after popup is closed.
2016-05-11 14:09:51 +02:00
Michael Hirsch
68a87490c6 Merge pull request #170 from bsinno/fix_remove_special_coap_auth_token
remove special coap-auth-token filter for coap-downloads
2016-05-11 14:09:18 +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
Kai Zimmermann
130c018cb7 Merge pull request #171 from bsinno/fix_device_simulator
Fixed auth problem in device simulator. Fixed equals ignore case in MD5 check.
2016-05-10 14:32:33 +02:00
Kai Zimmermann
a9283b402a Improved code readability.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 13:21:53 +02:00
Kai Zimmermann
1236f65d9d Improved sha1 gen performance by using buffered streams.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 13:12:19 +02:00
Kai Zimmermann
bc37ea9b23 Improved hiding for small tokens.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 12:08:29 +02:00
Kai Zimmermann
5443f6e419 Fixed auth problem in device simulator. Fixed equals ignore case in sha1
check.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 12:01:55 +02:00
Melanie Retter
f89b7e4beb Update AbstractTableDetailsLayout.java
use capital F for float value
2016-05-10 10:24:53 +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
Michael Hirsch
1420b9c292 Merge pull request #161 from bsinno/feature_add_targettoken_to_dmf
Add target security token to DMF update message
2016-05-09 13:07:51 +02:00
Kai Zimmermann
c2413ebd61 Added tests for md5 has gen in download messages.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-09 11:23:42 +02:00
Kai Zimmermann
5144f78c2b Improved code readability.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-09 10:50:14 +02:00
Michael Hirsch
042f1a0ff4 Merge pull request #153 from bsinno/fix-set-db-read-uncommited
let's try this out and merge it 👍
2016-05-06 14:10:30 +02:00
Kai Zimmermann
7d8095ede7 Merge branch 'master' into fix-set-db-read-uncommited
Conflicts:
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-06 10:17:18 +02:00
Kai Zimmermann
3c3a9107bb Merge pull request #169 from bsinno/fix_forbidden_exception_after_login
run getting polling configuration in system-code
2016-05-06 09:15:07 +02:00
Michael Hirsch
5220fa07ce allow system code to read tenant configuration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:40:08 +02:00
Michael Hirsch
077e3c8d38 add unit test for verification
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:16:12 +02:00
Michael Hirsch
d442a45b7a run getting polling configuration in system-code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-06 08:02:11 +02:00
Michael Hirsch
b1489f4c15 Merge pull request #167 from bsinno/fix_NplusOne_query_on_ui
Removed N+1 query from UI that came in with the DS tooltip.
2016-05-04 20:17:22 +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
a2597a215f Merge pull request #168 from bsinno/fix_caching_for_tenant_configuration
remove singleton instance wihthin TenantConfigurationManagement
2016-05-04 20:10:39 +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
Michael Hirsch
e2d9033821 remove singleton instance wihthin TenantConfigurationManagement
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-04 19:37:58 +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
Kai Zimmermann
2e9a7a5022 Merge pull request #165 from bsinno/migrate_sonar_false_positives_into_code
Migrated sonar false positives from sonarqube server into code.
2016-05-04 14:15:24 +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
ebe24394d0 Fixed comment 2016-05-04 12:24:23 +02:00
Kai Zimmermann
0014dc6302 Removed accidental addition of scala dependency.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:22:49 +02:00