Commit Graph

1566 Commits

Author SHA1 Message Date
Michael Hirsch
848632bd0b add missing license header
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-19 15:00:25 +02:00
Michael Hirsch
9bb8459f37 add missing license header
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-19 13:23:18 +02:00
Gaurav
88fb28b587 Fix for the targetFilterQuery not getting set while updating the filter.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-09-07 16:38:35 +02:00
Gaurav
226d23d4a7 Merge branch 'master' into feature_rsql_parser_suggestion 2016-09-07 13:11:23 +02:00
Gaurav
903e4103aa Fixed the compilation error.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-09-07 12:39:03 +02:00
Gaurav
af7eaa31b1 # WARNING: head commit changed in the meantime
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-09-07 12:04:51 +02:00
Gaurav
a42edd14ad Fix the issue on press of Enter key for querying the
filtered data but not on while selecting any suggestion by pressing
enter.
Also fixed the infinite looping of the progress spinner. 

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-09-07 11:56:59 +02:00
Kai Zimmermann
38364148d8 Merge pull request #285 from bsinno/fix_code_improvements
Fix code improvements
2016-09-07 10:56:01 +02:00
Kai Zimmermann
b35a1196ad Merge pull request #282 from bsinno/fix_filename_encondig
Added missing filename encondig
2016-09-07 09:34:34 +02:00
Michael Hirsch
14458a1ece code improvements
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-06 15:42:33 +02:00
Michael Hirsch
d229f45063 code improvement
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-06 14:55:48 +02:00
Michael Hirsch
c076162cc9 removed unused code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-06 14:47:39 +02:00
Michael Hirsch
1a243b3a4e code improvements
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-06 14:24:50 +02:00
Gaurav
9be2147702 Ordered the shortcut listener on the press of Enter key for querying the
filtered data.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-09-06 13:41:23 +02:00
Michael Hirsch
79b1ae8728 introduce autocomplete textfield with RSQL suggestion
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-05 13:36:52 +02:00
Kai Zimmermann
30d64c95e4 Added missing filename encondig
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-09-01 17:06:51 +02:00
Kai Zimmermann
2f415c4839 Merge pull request #274 from bsinno/fix_dialog_window_must_not_close_after_save_if_duplicate_exists
Fix for the dialog window must not close after save if duplicate exists.
2016-09-01 11:37:58 +02:00
Kai Zimmermann
63b12b0ac1 Merge pull request #278 from bsinno/feature_boot_13_sec_41
Upgrade Spring Boot and Security
2016-08-31 13:56:24 +02:00
Michael Hirsch
12387b7cd1 remove spaces
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-31 08:55:59 +02:00
Kai Zimmermann
000fa2ab9b Merge pull request #279 from bsinno/fix_negative_max_assignments
Fix negative max assignments of softwareModuleTypes
2016-08-31 08:55:44 +02:00
SirWayne
a1a7a6dc45 Adapt test to new json path
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-29 17:11:33 +02:00
kaizimmerm
829076eddc Merge branch 'feature_boot_13_sec_41' of https://github.com/bsinno/hawkbit.git into feature_boot_13_sec_41 2016-08-29 14:13:17 +02:00
kaizimmerm
6dc2888499 Fixed merge mistake
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-29 14:12:56 +02:00
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
Michael Hirsch
0434866cb4 Merge pull request #280 from bsinno/remove_scala_depdencency
remove unnecessary scala dependency
2016-08-26 13:34:50 +02:00
Michael Hirsch
5e7cca9941 remove unnecessary scala dependency
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-26 13:30:00 +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
Melanie Retter
f3534bc4d9 Refactor, add db clean script
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-26 10:32:48 +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
Melanie Retter
171f96f309 Remove DB migration skripts
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 17:27:18 +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
Melanie Retter
1620385e35 Insert empty row in header
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 10:59:37 +02:00
Melanie Retter
34daea319c Rename constant WHITESPACE
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 10:39:50 +02:00
Melanie Retter
d84365e3d2 Refactor
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-25 09:51:16 +02:00
Melanie Retter
61ebcc89ff Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 17:40:23 +02:00
Melanie Retter
d437d86f26 Correct test description
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 16:55:17 +02:00
Melanie Retter
d323f67648 Refactor ConstraintViolationException
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 16:38:18 +02:00
Melanie Retter
fbe29a8a87 Merge branch 'master' into
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:46:23 +02:00
Melanie Retter
4d47a86285 Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:26:46 +02:00
Melanie Retter
50a86cdb7b ConstraintViolationException can contain mulitple violation messages
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 13:48:18 +02:00
Melanie Retter
679f465db1 Insert custom constraintViolationException
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 13:07:37 +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
Melanie Retter
3ac8dc93a3 Add Test for SoftwareManagement#createSoftwareModuleType
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 09:49:05 +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