Jonathan Philip Knoblauch
|
e658e7dac6
|
Merged changes from master into ddi-resources
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
|
2016-05-17 12:49:32 +02:00 |
|
SirWayne
|
354ed91fa7
|
Merge branch 'master' into Feature/Add_Rest_Api_with_Java_client
Conflicts:
examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java
examples/hawkbit-mgmt-api-client/pom.xml
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java
examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java
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/artifacts/upload/UploadHandler.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ProxyTarget.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/event/CustomFilterUIEvent.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.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/TargetAddUpdateWindowLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DistributionBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/ProxyRollout.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/ProxyRolloutGroup.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
hawkbit-ui/src/main/resources/messages.properties
hawkbit-ui/src/main/resources/messages_de.properties
hawkbit-ui/src/main/resources/messages_en.properties
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
|
2016-05-17 11:16:18 +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
|
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 |
|
Jonathan Philip Knoblauch
|
205216f7dd
|
Added @SuppressWarnings annotation and reseted readme.md in hawkbit parent
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
|
2016-05-06 16:08:16 +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 |
|
SirWayne
|
a18bd9ac21
|
Modify module name
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
|
2016-05-04 12:50:15 +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 |
|
Kai Zimmermann
|
6df949bf2b
|
Set sw version also if modules empty.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
|
2016-05-04 12:22:19 +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 |
|
Kai Zimmermann
|
ffece302de
|
https config for cloud.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
|
2016-05-04 08:28:11 +02:00 |
|
Kai Zimmermann
|
16350c5e15
|
Made URL generator configurable.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
|
2016-05-03 18:34:16 +02:00 |
|