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

1501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SirWayne
a71179b5fa Remove abstract mongo db test class, because every test starts a mongo. 
This class is not necessary

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-29 11:04:49 +02:00
Kai Zimmermann
16f4654ce0 Removed Jackson version override 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-29 10:31:28 +02:00
Kai Zimmermann
1c9514c103 Merge branch 'feature_boot_13_sec_41' of https://github.com/bsinno/hawkbit.git into feature_boot_13_sec_41 2016-08-26 10:59:06 +02:00
kaizimmerm
09dc3b00f1 Merge branch 'master' into feature_boot_13_sec_41 2016-08-26 09:17:39 +02:00
Kai Zimmermann
f779b3aba7 removed unneeded override 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-26 09:15:08 +02:00
Kai Zimmermann
0b0503a77f Fixed locale problem on non EN systems 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-25 15:19:53 +02:00
kaizimmerm
9eee1985e2 Upgrade jackson. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-25 14:55:13 +02:00
Kai Zimmermann
8ded4a29d2 Merge pull request #277 from bsinno/fix_unhandled_ConstraintViolationException 
Fix unhandled constraint violation exception
 2016-08-24 11:46:43 +02:00
Kai Zimmermann
2e0208f054 Fixed test after merge 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-24 11:35:02 +02:00
Kai Zimmermann
d9b83a75d0 Merges with master 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by:
 2016-08-24 11:03:16 +02:00
kaizimmerm
00539ea49c Merges with master 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 10:58:03 +02:00
kaizimmerm
aff2350186 Fix simulator log config. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:41:30 +02:00
Kai Zimmermann
4469576779 Upgarde boot and sec to newest patch version. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-24 09:41:30 +02:00
kaizimmerm
7a38e212b6 Fixed license header and entity scan. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:36 +02:00
kaizimmerm
2153f627c6 Using same plugin for weave and metamodel 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:36 +02:00
kaizimmerm
05c45d70d9 Removed enable auto configure from repo config 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:35 +02:00
kaizimmerm
17a8f01d84 Fixed tests. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:11 +02:00
kaizimmerm
ff500d3bd7 Started migration for Boot 1.3 and Security 4.1 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:38:53 +02:00
Kai Zimmermann
b3db6e4ae2 Merge pull request #276 from bsinno/fix_remove_unnecessary_save 
Removed unnecessary target info startus persistence.
 2016-08-24 09:05:26 +02:00
Melanie Retter
75a404c95f Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-22 15:00:21 +02:00
Melanie Retter
4e292d48b7 Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-22 14:57:46 +02:00
SirWayne
84c9296a70 Merge branch 'eclipse/master' into 
fix_unhandled_ConstraintViolationException

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 14:38:28 +02:00
kaizimmerm
276792d005 Fix simulator log config. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-19 14:22:43 +02:00
kaizimmerm
795515e0b7 Improve readability 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-19 14:22:12 +02:00
SirWayne
ac8fc06036 Validate all drag and drop events 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 13:44:49 +02:00
Michael Hirsch
3650b31c9e Merge pull request #273 from bsinno/fix-improve-code-quality 
Minor code improvements
 2016-08-19 13:22:12 +02:00
Dominic Schabel
01d5d5e931 Merge branch 'master' into fix-improve-code-quality 
# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-19 12:33:46 +02:00
Kai Zimmermann
bd5d532d60 Fixed missing controller poll update in case of EVENT. Fixed eventBus 
duplicate event post.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-19 11:19:33 +02:00
Kai Zimmermann
7f68aedd78 Merge branch 'master' into feature_boot_13_sec_41 
Conflicts:
	hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/FreePortFileWriter.java
	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/FreePortFileWriter.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-19 08:35:58 +02:00
Michael Hirsch
9610c83085 Merge pull request #271 from bsinno/fix_upload_status_dialog_showing_all_files 
add files to status dialog when receive upload
 2016-08-19 08:22:09 +02:00
Michael Hirsch
37faa151f0 Merge pull request #272 from bsinno/fix_toomany_status_entries_dont_requeue 
don't reject too many status entries exception
 2016-08-19 08:19:15 +02:00
SirWayne
4585c55689 Set closable to false that to disable 1 cross 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-18 15:32:25 +02:00
Kai Zimmermann
4b58d83e01 Upgarde boot and sec to newest patch version. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-18 14:54:32 +02:00
SirWayne
d05b5ebc1f Rename builder methode for TextComponent. Fix to set textfield ids. 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-18 11:15:00 +02:00
Kai Zimmermann
09c329a485 Removed unnecessary target info startus persistence. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-18 10:34:43 +02:00
Michael Hirsch
630cf09162 add files to status dialog when receive upload 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-18 08:42:55 +02:00
Dominic Schabel
b409e831f1 Merge branch 'master' into fix-improve-code-quality 2016-08-17 18:01:22 +02:00
Michael Hirsch
17a2000333 Merge pull request #269 from bsinno/feature_allow_disable_amqp_interface_in_simulator 
introduce property to disable amqp interface in simulator
 2016-08-17 10:05:59 +02:00
SirWayne
e6f80756f1 Merge from master 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-17 09:34:59 +02:00
SirWayne
7ea17c54f1 Add TextBuilderArea 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-17 09:02:04 +02:00
SirWayne
8d7cdb7e13 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 17:33:27 +02:00
SirWayne
1d825f9c74 Add a textfield builder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 17:33:06 +02:00
Dominic Schabel
1094c3c12f Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 16:11:15 +02:00
Dominic Schabel
876c599617 Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 15:28:59 +02:00
SirWayne
6db64dd5df Merge master 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:27:45 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into 
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:17:30 +02:00
SirWayne
9545ff5626 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 14:51:42 +02:00
SirWayne
8ccc9811a8 Add LabelBuilder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 14:51:36 +02:00
SirWayne
a51bf0ac02 Add LabelBuilder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 14:38:21 +02:00
Dominic Schabel
5e48569462 Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 13:41:15 +02:00