kaizimmerm
6c2c3e0b7f
Merge branch 'master' into feature_dmf_disable
2016-09-14 09:06:56 +02:00
Kai Zimmermann
d59065a509
Merge pull request #289 from bsinno/fix_mgmt_feign
...
Fix Mgmt Client Netflix Feign usage
2016-09-13 16:14:26 +02:00
Melanie Retter
929399b68e
Rename SPUIComponentIdProvider. Remove SP Prefix
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-09-13 15:54:00 +02:00
kaizimmerm
17e4415b26
Comment on indexToExpander line
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-13 10:07:24 +02:00
kaizimmerm
59dd97e851
Removed unnecessary spy
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-13 09:55:44 +02:00
kaizimmerm
b27b085622
Merge branch 'fix_wrong_error_response' of https://github.com/bsinno/hawkbit.git into fix_wrong_error_response
2016-09-13 09:51:19 +02:00
kaizimmerm
5ed5142429
Improve readability
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-13 09:51:10 +02:00
Kai Zimmermann
da1f91b24a
Merge pull request #283 from bsinno/fix_dmf_cancel
...
Fixed DMF sending out wrong message if action on CANCELING
2016-09-13 09:44:37 +02:00
Michael Hirsch
2ea0dc8eb7
Merge pull request #288 from bsinno/fix_dont_requeue_too_many_status_entries
...
don't requeue too many status entries ex, fix typo of ex
2016-09-12 12:30:22 +02:00
Michael Hirsch
228524dccf
add dummy artifact upload again
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-09-12 11:29:35 +02:00
kaizimmerm
11aea8ea4d
Added defaults
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-12 10:29:07 +02:00
Michael Hirsch
0986b9985b
don't requeue too many status entries ex, fix typo of ex
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-09-12 09:27:43 +02:00
Dominic Schabel
7b7b799435
Typo fixed
...
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com >
2016-09-09 09:34:12 +02:00
Dominic Schabel
1d5d467f16
Typo fixed
...
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com >
2016-09-09 09:15:26 +02:00
kaizimmerm
9d92e9ddc6
Added missing spring cloud dependencies
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-07 17:43:41 +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
Melanie Retter
80a62a31b1
Merge remote-tracking branch 'origin/master' into
...
fix_refactor_spTestUtil
Conflicts:
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-09-07 15:41:49 +02:00
kaizimmerm
d51497669a
Removed dead code
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-07 13:37:26 +02:00
Gaurav
226d23d4a7
Merge branch 'master' into feature_rsql_parser_suggestion
2016-09-07 13:11:23 +02:00
kaizimmerm
c2a982714d
Merge branch 'master' into fix_dmf_cancel
2016-09-07 12:45:37 +02:00
kaizimmerm
d30b859711
Merge branch 'master' into fix_mgmt_feign
2016-09-07 12:44:27 +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
kaizimmerm
5042dd4a9d
Merge branch 'master' into feature_dmf_disable
2016-09-07 12:24:28 +02:00
kaizimmerm
47e3417f55
Improved method naming
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-07 12:17:50 +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
kaizimmerm
525ca8d72c
Run only in case of failure
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-07 11:58:00 +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
kaizimmerm
ba3ae4fd4d
DMF enabled by default.
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-07 11:34:40 +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
Kai Zimmermann
be841c6095
Fixed feign usage after Spring Boot 1.3 upgrade
...
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com >
2016-09-07 09:32:18 +02:00
Kai Zimmermann
e03bca45d5
Allow DMF to be disabled
...
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com >
2016-09-07 09:30:48 +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
bdd56c3b4a
validate the type parameter of softwaremodule
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-09-06 11:26:56 +02:00
Melanie Retter
40e1891eb2
Correct constant
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-09-06 10:58:44 +02:00
Melanie Retter
2ed9f1c08b
Add new constant and substitue in classes
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-09-06 09:47:38 +02:00
Melanie Retter
9ee4a60a89
add new constants, fix typo
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-09-05 19:12:06 +02:00
kaizimmerm
b317823e86
Fixed entity content validation.
...
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com >
2016-09-05 14:56:28 +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
8ce8d8e571
Fixed DMF sending out wrong message if action on CANCELING
...
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com >
2016-09-05 09:17:15 +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