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

1074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kai Zimmermann
0beef57df7 Added rabbit connection heartbeat for DMF. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-09 11:57:44 +02:00
Kai Zimmermann
ec25f2961e Merge pull request #201 from bsinno/feature_remote_ip_tracking_config 
Make DDI remote IP tracking configurable
 2016-06-08 21:11:04 +02:00
Kai Zimmermann
4f23fb1377 Created separate bean for poolexecutor. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-08 11:58:59 +02:00
SirWayne
1392798bf7 Fix some small clean code issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-08 10:54:29 +02:00
SirWayne
c3f0f6e0d6 Extract the tenant cache key generator to an own service 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-08 09:48:08 +02:00
Kai Zimmermann
d9046bb9cc Upgraded Spring AMQP. Added task scheduler. Improved executor shutdown. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-07 18:38:39 +02:00
Kai Zimmermann
2fc74329c6 Merge pull request #202 from bsinno/fix_Improve_space_usage_for_tag_type_names 
Fix improve space usage for tag type names
 2016-06-07 15:36:10 +02:00
Melanie Retter
c6f595edf9 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/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/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 14:36:28 +02:00
Melanie Retter
023bcf6876 delete duplicate style assignment 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 12:41:57 +02:00
Melanie Retter
158a198cf4 Changed padding left/right of Simple Filter tags 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 11:28:10 +02:00
Melanie Retter
9fe527bf30 Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs 2016-06-07 09:35:08 +02:00
Melanie Retter
ddc6580d04 Correct component's IDs 
Correct ID save/cancel button

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Correct IDs

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Change button naming, fix selenium tests

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Fix selenium test

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-07 09:22:16 +02:00
Melanie Retter
909a809b4b Improve padding on the left side 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 18:57:39 +02:00
Melanie Retter
461ba38a5f Fix selenium test 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 18:08:34 +02:00
Melanie Retter
3e46568d2c Change button naming, fix selenium tests 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 17:50:31 +02:00
SirWayne
9baf668b31 Fix header and change beand service registration 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-06 14:29:39 +02:00
Melanie Retter
739f3eb012 correct css 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-06 12:40:55 +02:00