lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,091 Commits 1 Branch 0 Tags
a11d2bc7f5b5a381d02ed2871e0f89398cb2cd45
Commit Graph

1091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Hirsch
a11d2bc7f5 Merge branch 'master' into feature_security_adaptions 2016-06-22 15:49:14 +02:00
Michael Hirsch
11f2232247 add prefixed ROLE_ to granted authorities to work with out-of-the-box 
spring security

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 15:47:38 +02:00
Michael Hirsch
aef2e3450a remove special health security check because this can be made with 
spring security out-of-the box

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 15:46:43 +02:00
Michael Hirsch
bab32c86a7 Merge pull request #220 from bsinno/feature_add_security_evalexpr_system_monitor_permission 
add spring security eval expression for system_monitor permission
 2016-06-22 15:00:06 +02:00
Michael Hirsch
9226f514d2 add spring security eval expression for system_monitor permission 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 13:36:22 +02:00
Michael Hirsch
135dc8a2d1 Merge pull request #218 from bsinno/fix_jacoco_version_update 
update jacoco version
 2016-06-22 13:04:34 +02:00
Michael Hirsch
dfa547d382 update jacoco version 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-21 11:14:22 +02:00
Kai Zimmermann
b521a42a29 Merge pull request #216 from bsinno/fix_lazy_initialization_of_tenant_at_login 
re-order tenant lazy initialization filter after authentication chain
 2016-06-20 12:08:04 +02:00
Michael Hirsch
dbb2e00ed8 re-order tenant lazy initialization filter after authentication chain 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-20 10:16:15 +02:00
Kai Zimmermann
dc16844e5c Merge pull request #210 from bsinno/feature_rollouts_credentials 
Refactoring
 2016-06-17 11:29:48 +02:00
SirWayne
bcd496a1f4 Add Base Entity Matcher 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-16 15:33:00 +02:00
SirWayne
c384319686 Move @EnableScheduling to RepositoryConfig 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 16:56:51 +02:00
SirWayne
c76bca3c41 Add Javadoc and fix typo 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 13:12:59 +02:00
Kai Zimmermann
b9d2d7a192 Merge pull request #213 from bsinno/fix_avoid_loosing_data_if_pool_maxed_out 
Set new policy for central executor pool to avoid loosing data.
 2016-06-15 12:50:19 +02:00
kaizimmerm
6fc3b2ab94 Immediate return. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-15 12:17:26 +02:00
kaizimmerm
f65ca18bda Set new policy for central executor pool to avoid loosing data. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-15 12:03:55 +02:00
Kai Zimmermann
824f9150bb Merge pull request #211 from bsinno/fix_display_problem_in_different_browsers 
fix display problems in different browsers
 2016-06-15 11:35:28 +02:00
Kai Zimmermann
8946d15958 Merge pull request #212 from bsinno/fix_correlationdata_can_be_null 
Fixed problem where correlation data is null.
 2016-06-15 11:35:12 +02:00
Melanie Retter
ebedcc2df0 fix display problems in different browsers 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-15 11:25:58 +02:00
kaizimmerm
f04c3655ed Fixed problem where correlation data is null. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-15 11:25:46 +02:00
SirWayne
f5f07e4af2 Add line ending 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 10:57:06 +02:00
SirWayne
7345855a44 Add line ending 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 10:49:43 +02:00
SirWayne
1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 09:53:06 +02:00
Kai Zimmermann
d0629c8071 Merge pull request #208 from bsinno/fix_optional_rabbit_factory 
Fixed new factory configuration.
 2016-06-14 17:52:08 +02:00
Kai Zimmermann
a690ff2b70 Fixed new factory configuration. It was non optional which in result 
will not work if the factory comes from another source, e.g. cloud
foundry.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-14 17:50:54 +02:00
Kai Zimmermann
10e1a6c00b Merge pull request #205 from bsinno/fix_delete_ds 
Fixed bug where DS could not be deleted as it was assigned to a rollout.
 2016-06-13 16:57:56 +02:00
Kai Zimmermann
3669ac86d5 Merge pull request #206 from bsinno/fix_typo 
Fixed typos in repo default setup and logging.
 2016-06-13 16:55:52 +02:00
Dominic Schabel
4523032e97 Property for maven scm plugin introduced 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-06-13 16:45:40 +02:00
Kai Zimmermann
8230a47620 Fixed typos in repo default setup and logging. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-13 16:02:04 +02:00
Jonathan Knoblauch
2b245aec82 Misspelling 
Changed refernce to reference
 2016-06-13 14:50:45 +02:00
Kai Zimmermann
19a62694d8 Merge pull request #203 from bsinno/feature_asynchronous_health 
Upgraded Spring AMQP. Added task scheduler. Improved executor shutdown.
 2016-06-13 13:21:56 +02:00
Kai Zimmermann
f532a0907c Merge branch 'eclipsemaster' into feature_asynchronous_health 
Conflicts:
	pom.xml


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-13 12:51:26 +02:00
Kai Zimmermann
3726aac6db Cleaned up default mismatch. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-13 12:38:08 +02:00
Kai Zimmermann
12ce60f72a Rabbit publisherConfirms 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-12 08:09:28 +02:00
Dominic Schabel
a81ecb418e Fixed some maven warnings and introduced compiler output within a maven build 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-06-10 17:22:58 +02:00
SirWayne
c0b118d5f9 Move filter chain cause of autowiring problems 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-10 16:18:54 +02:00
Kai Zimmermann
64f3acfa2b Improved documentation of time value. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-10 15:45:20 +02:00
Dominic Schabel
06ccd125f9 Year of licence header fixed. 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-06-10 13:11:12 +02:00
Kai Zimmermann
2b2ba523f5 Fixed bug where DS could not be delete as it was assigned to a rollout. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-10 11:00:58 +02:00
Dominic Schabel
93ce7e9bf4 Constant for security log prefix introduced. 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-06-10 10:59:45 +02:00
Dominic Schabel
496fb5ff35 Fixed line endings 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-06-10 10:45:28 +02:00
Kai Zimmermann
8086a2c576 Merge pull request #204 from eclipse/eclipsemaster 
Upgrade hateoas that removes transitive dependency that failed IP check.
 2016-06-09 17:53:37 +02:00
Kai Zimmermann
cc7cb20b3e Upgrade hateoas that removes transitive dependency that failed IP check. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-09 17:50:45 +02:00
Kai Zimmermann
15cb1e4171 Merge pull request #195 from bsinno/fix_introduce_consistent_button_position_in_change_dialogs 
CommonDialogWindow for pop-up-windows
 2016-06-09 17:45:18 +02:00
SirWayne
ed8827726c Refactor auditore aware 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-09 17:31:34 +02:00
Melanie Retter
5eee32ecc9 Merge remote-tracking branch 'origin/master' into 
fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 17:06:19 +02:00
Melanie Retter
8e17400d93 ControllerID is focused when opening the configure target dialog 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 16:54:38 +02:00
Melanie Retter
c7ab3fe06d ColorPicker closes when second click on previewButton 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 16:49:03 +02:00
Melanie Retter
8ae8696dfa remove maximize button 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-09 13:40:24 +02:00
Kai Zimmermann
00013a7f36 Added executor config to tests. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-09 13:00:47 +02:00