Michael Hirsch
|
ebf2c15da9
|
use private method getEntityFactory()
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 12:07:35 +02:00 |
|
Kai Zimmermann
|
a978662812
|
Merge pull request #226 from bsinno/feature_ui_metadata
Management UI DS and SM metadata mgmt
|
2016-07-25 12:03:57 +02:00 |
|
Michael Hirsch
|
2f263faca0
|
suppress warning for multiple checked exception declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 12:01:28 +02:00 |
|
Michael Hirsch
|
7e94c9f684
|
write comment in constructor why necessary
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 11:58:11 +02:00 |
|
Michael Hirsch
|
227267af88
|
avoid more than 3 nested if/switch/try blocks
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 11:18:05 +02:00 |
|
Michael Hirsch
|
40a12c0321
|
remove unnecessary IOException from method signature
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 11:16:37 +02:00 |
|
Michael Hirsch
|
400c8bafcf
|
move method to the right inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 11:10:59 +02:00 |
|
Michael Hirsch
|
9727af7a99
|
don't use getBytes using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 10:54:05 +02:00 |
|
Michael Hirsch
|
928ad1520b
|
remove port 8080 to fix tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 10:39:55 +02:00 |
|
Michael Hirsch
|
812498d2fe
|
don't use constructor using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 10:22:35 +02:00 |
|
Michael Hirsch
|
82fa485ddc
|
suppress warning squid:S2221
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 10:13:07 +02:00 |
|
Michael Hirsch
|
f3b472bcd2
|
Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-25 10:08:24 +02:00 |
|
Michael Hirsch
|
3e4f76cca6
|
Merge branch 'master' into feature_multiunassignment_soft_mod
|
2016-07-22 15:16:38 +02:00 |
|
Michael Hirsch
|
2d58cfcc59
|
Merge branch 'master' into feature_ui_metadata
|
2016-07-22 15:14:37 +02:00 |
|
Kai Zimmermann
|
0380fdf8ba
|
Merge pull request #255 from bsinno/fix_upgrade_collections
Upgrade Apache Collections to 4.1 due to known vulnerability.
|
2016-07-21 12:52:35 +02:00 |
|
GAH6KOR
|
02e96fa079
|
Merge branch 'master' into feature_enable_push_in_deployment_view
|
2016-07-21 12:41:56 +02:00 |
|
GAH6KOR
|
5f1db53def
|
Removed the extra level of abstraction and modified the code
accordingly.
|
2016-07-21 12:39:54 +02:00 |
|
kaizimmerm
|
1c70527083
|
Upgrade Apache Collections to 4.1 due to known vulnerability.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
|
2016-07-21 11:44:41 +02:00 |
|
kaizimmerm
|
2e416d0027
|
Using same plugin for weave and metamodel
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
|
2016-07-21 10:39:57 +02:00 |
|
Kai Zimmermann
|
8a4e952bdb
|
Merge pull request #252 from bsinno/feature_upgrade_spring_amqp
Upgrade Spring AMQP to 1.6.1
|
2016-07-21 10:38:54 +02:00 |
|
Kai Zimmermann
|
6eadd6a3eb
|
Merge pull request #251 from bsinno/feature_rsql_last_poll
Added feature to query by last target poll.
|
2016-07-21 10:38:09 +02:00 |
|
Michael Hirsch
|
adb60156f8
|
Merge pull request #254 from bsinno/add_hawkbit_logo_to_readme
Add hawkbit logo to readme
|
2016-07-21 09:39:19 +02:00 |
|
Michael Hirsch
|
af00f3aa1b
|
resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-21 08:32:53 +02:00 |
|
Michael Hirsch
|
2fe670b57f
|
resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-21 08:27:04 +02:00 |
|
Michael Hirsch
|
d12bd8c2db
|
try out image tag for resize
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-21 08:26:10 +02:00 |
|
Michael Hirsch
|
4bc5bb2dd3
|
Merge pull request #253 from bsinno/fix_initial_tenant_creation
remove caching from jpa_system_management
|
2016-07-20 19:35:26 +02:00 |
|
Michael Hirsch
|
b04755eda8
|
remove caching from jpa_system_management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-20 18:05:21 +02:00 |
|
Dominic Schabel
|
fd749a9d69
|
Minor review comments added.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
|
2016-07-20 18:03:28 +02:00 |
|
Michael Hirsch
|
5a6d656b75
|
add hawkbit logo to readme.md
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-20 16:51:01 +02:00 |
|
GAH6KOR
|
7afb2f996f
|
Merge branch 'master' into feature_enable_push_in_deployment_view
|
2016-07-20 12:31:28 +02:00 |
|
Kai Zimmermann
|
1ae3b4bcbb
|
Upgrade Spring AMQP to 1.6.1
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
|
2016-07-20 11:45:53 +02:00 |
|
GAH6KOR
|
b92794c5ef
|
Merge branch 'feature_multiunassignment_soft_mod' of https://github.com/bsinno/hawkbit/ into feature_multiunassignment_soft_mod
|
2016-07-20 11:02:24 +02:00 |
|
GAH6KOR
|
79823b2930
|
Merge branch 'master' into feature_multiunassignment_soft_mod
|
2016-07-20 11:01:15 +02:00 |
|
Kai Zimmermann
|
2ad5d8cfb1
|
Added feature to query by last target poll.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
|
2016-07-20 10:34:19 +02:00 |
|
Michael Hirsch
|
03fecba57d
|
Merge branch 'master' into feature_ui_metadata
|
2016-07-19 19:12:31 +02:00 |
|
Michael Hirsch
|
9ac4bbcc54
|
Merge pull request #250 from bsinno/fix_initial_tenant_creation
remove cacheable on initial tenant creation
|
2016-07-19 18:35:56 +02:00 |
|
Michael Hirsch
|
fe0a719ede
|
remove cacheable on initial tenant creation
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-19 18:01:06 +02:00 |
|
gah6kor
|
85e22da7a2
|
Merge branch 'master' into feature_ui_metadata
Conflicts:
hawkbit-ui/src/main/resources/messages.properties
|
2016-07-19 16:38:52 +02:00 |
|
Michael Hirsch
|
2411faf1f2
|
Merge pull request #249 from bsinno/fix_initial_tenant_creation
don't return null on isAuthenticated method is boolean
|
2016-07-19 16:35:30 +02:00 |
|
gah6kor
|
8e98b5a8e2
|
Merge branch 'master' into feature_enable_push_in_deployment_view
|
2016-07-19 16:12:01 +02:00 |
|
gah6kor
|
01d2cc8422
|
Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
|
2016-07-19 16:09:47 +02:00 |
|
Michael Hirsch
|
d1c889bf16
|
don't return null on isAuthenticated method is boolean
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-19 15:51:22 +02:00 |
|
Kai Zimmermann
|
ba177f77c0
|
Merge pull request #222 from bsinno/Fix_Consistent_context_menu_on_tables
Fix consistent context menu on tables
|
2016-07-19 14:50:02 +02:00 |
|
Michael Hirsch
|
f540f4c1e2
|
Merge pull request #247 from bsinno/fix_initial_tenant_creation
fix invalidating correct caches when update tenant metadata
|
2016-07-19 13:56:51 +02:00 |
|
Michael Hirsch
|
cc986fe6f0
|
fix invalidating correct caches when update tenant metadata
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
|
2016-07-19 13:35:47 +02:00 |
|
gah6kor
|
ffb29206fd
|
Merge branch 'master' into feature_ui_metadata
|
2016-07-19 12:43:36 +02:00 |
|
gah6kor
|
39a2e3ab20
|
Removed the discard and maximize buttons
|
2016-07-19 12:42:16 +02:00 |
|
Kai Zimmermann
|
c360f01e2b
|
Merge pull request #246 from bsinno/fix_initial_tenant_creation
Fix initial tenant creation
|
2016-07-19 08:36:46 +02:00 |
|
gah6kor
|
a87a219540
|
Merge branch 'master' into feature_ui_metadata
Conflicts:
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
|
2016-07-18 18:10:09 +02:00 |
|
Michael Hirsch
|
bcfc10adab
|
Merge branch 'master' into feature_multiunassignment_soft_mod
|
2016-07-18 16:30:51 +02:00 |
|