Michael Hirsch
be45209598
Merge remote-tracking branch 'refs/remotes/eclipse/master'
2016-02-05 11:14:23 +01:00
Michael Hirsch
4be2cfd878
Merge pull request #25 from bsinno/fix_mysql_empty_in_statement
...
Fix mysql empty in statement
2016-02-05 11:07:31 +01:00
Michael Hirsch
7e92f5925e
added flush before executing asynchronous group creation to avoid
...
InvalidDataAccessApiUsageException because Rollout entity has not yet ID
set.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-05 08:12:12 +01:00
venu1278
759c36d16b
Merge branch 'master' into MECS-1452_Support_additional_field_name_and_operators_in_search_query
2016-02-05 12:29:33 +05:30
venu1278
a9b36c0fc7
Merge branch 'master' into MECS-1454_Search_filter_improvements
...
Conflicts:
hawkbit-ui/src/main/resources/messages.properties
hawkbit-ui/src/main/resources/messages_de.properties
hawkbit-ui/src/main/resources/messages_en.properties
2016-02-05 11:55:55 +05:30
venu1278
f6ae3cbfe5
MECS-145_Minor_improvements_in_search_filter_New.
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-02-05 11:41:02 +05:30
Michael Hirsch
f4c877103f
fix empty in statement of count select when using mysql. Do empty check
...
of list.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-04 20:39:29 +01:00
Kai Zimmermann
fcff3e9917
Merge remote-tracking branch 'eclipse/master'
2016-02-04 18:48:38 +01:00
Kai Zimmermann
0aa254b45c
Merge pull request #24 from bsinno/rollout_mgmt
...
Looks good, merged
2016-02-04 18:47:35 +01:00
Michael Hirsch
82d51da98f
exclude license check of addons.scss due it's generated
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-04 18:19:07 +01:00
Michael Hirsch
08ffb16352
fix license header
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-04 17:51:05 +01:00
Michael Hirsch
543849db98
fix wrong test verification of http response status, should return 403
...
not 201.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-04 15:49:45 +01:00
Kai Zimmermann
71fd087510
Merge remote-tracking branch 'eclipse/master'
2016-02-04 15:18:56 +01:00
Michael Hirsch
f18825ce34
Initial Contribution of the rollout-management feature
...
- Repository functionality for rollout, rolloutgroup entities
- Rollout scheduler to watch and handle running rollouts and start next
group of rollout
- Vaadin view to administrate rollouts and reflect the current rollout
status
- REST resources to cover rollout creation, updating, starting, pausing
and resuming
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-04 15:10:44 +01:00
venu1278
6f1e07d258
MECS-1452_Support_additional_field_name_and_operators_in_search_query
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-02-04 12:56:27 +05:30
venu1278
84830ba5d2
MECS-1454_Search_filter_improvements
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-02-04 11:19:45 +05:30
Kai Zimmermann
04f1f3da06
Merge pull request #20 from bsinno/device_simulator_improvements
...
+1, merged
2016-02-03 12:07:06 +01:00
Michael Hirsch
9ff1e89717
add javadoc parameter to simulatorcontroller
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-03 10:34:52 +01:00
Michael Hirsch
c798620c9b
Merge pull request #18 from bsinno/fix-sonar-issues
...
ok 👍 Fix sonar issue in UI file read
2016-02-03 10:12:42 +01:00
Michael Hirsch
e35017cfe7
fix license header in application-cloud.properties file
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-03 09:59:13 +01:00
Kai Zimmermann
99b4535aa3
Merge pull request #19 from bsinno/fix_overwrite_anonymous_property
...
+1, merged
2016-02-03 09:39:39 +01:00
Michael Hirsch
b81b37a988
- extend simulator rest-api for simulating also DDI devices
...
- adapt readme.md to document new simulator rest-api
- remove basic-auth from standard application properties and introduce
an extra cloud-profile which includes basic-auth-security parameters for
easier use locally
- fix dialog for amount with 4 digit and comma charachter
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-03 09:35:07 +01:00
venu1278
25b6ef31aa
MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-02-03 12:58:27 +05:30
venu1278
ee7603b8c2
Merge branch 'master' into MECS-1454_Search_filter_improvements
2016-02-03 12:49:18 +05:30
venu1278
973a5dd72a
MECS-1454: Minor_improvements_in_search_filter_New
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-02-03 12:46:12 +05:30
Michael Hirsch
97b581d68f
Merge branch 'master' into fix_overwrite_anonymous_property
2016-02-02 17:48:33 +01:00
Michael Hirsch
d55e521701
fixing security properties for anonymous enabled, adding javadoc
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-02-02 17:32:10 +01:00
Kai Zimmermann
5331a9c06e
Merge remote-tracking branch 'eclipse/master'
2016-02-02 15:29:38 +01:00
Kai Zimmermann
31425b8df9
Merge pull request #17 from bsinno/Wrong_Predicate_For_Boolean_Filter
...
+1, merge
2016-02-02 14:01:00 +01:00
SirWayne
82511beb8c
Merge branch 'master' into Wrong_Predicate_For_Boolean_Filter
2016-02-02 10:50:51 +01:00
Kai Zimmermann
3094319f00
Merge remote-tracking branch 'eclipse/master'
2016-02-02 10:46:41 +01:00
Michael Hirsch
9474171bd4
Merge pull request #16 from bsinno/Sonar_Fix_protected_member
...
+1, merged
Sonar fix protected member
2016-02-02 10:45:51 +01:00
Kai Zimmermann
bc46bac2ac
Fix sonar issue
2016-02-02 10:19:37 +01:00
SirWayne
bf7745160c
- Fix conversion for boolean for sql query. If boolean is not wellformed
...
a rsql syntax error is thrown
- Escape % for sql query#
- Remove operator like ("=li=")
- Extend not equal operator with not like jpa query
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-02-02 09:26:22 +01:00
Kai Zimmermann
4df411b97f
Merge remote-tracking branch 'eclipse/master'
2016-02-02 08:53:59 +01:00
SirWayne
21d19b2bd2
Fix conversion for boolean (and other types) for the jpa criteria
...
builder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-02-01 16:17:07 +01:00
Kai Zimmermann
a01b8c2dd5
Merge pull request #14 from bsinno/circle-ci-gitter-webhook
...
Ok
2016-01-30 14:33:02 +01:00
Kai Zimmermann
135fd60a54
Merge remote-tracking branch 'eclipse/master' into Sonar_Fix_protected_member
2016-01-30 08:28:04 +01:00
Kai Zimmermann
cc3fdff93f
Merge remote-tracking branch 'eclipse/master' into circle-ci-gitter-webhook
2016-01-30 08:27:32 +01:00
Kai Zimmermann
c4a6b47505
Merge remote-tracking branch 'eclipse/master'
2016-01-30 08:27:22 +01:00
Kai Zimmermann
0bbba9b4a9
Disabled sonar github integration
...
... as it does not work for pull requests from 3rd parties
2016-01-29 19:44:51 +01:00
SirWayne
676aea4bfb
Merge branch 'master' into Sonar_Fix_protected_member
2016-01-29 12:02:11 +01:00
Kai Zimmermann
4a2b09387a
Merge remote-tracking branch 'eclipse/master'
2016-01-29 12:00:43 +01:00
Kai Zimmermann
1e51ffd559
Merge remote-tracking branch 'eclipse/master' into circle-ci-gitter-webhook
2016-01-29 11:44:16 +01:00
Kai Zimmermann
f6ad6490a5
Extended contact information
2016-01-29 11:28:29 +01:00
SirWayne
ef3618ed9e
Fix Sonar Issue: Change visibilty of mutable field
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-01-29 11:27:57 +01:00
Kai Zimmermann
518d4ca1e7
Merge remote-tracking branch 'eclipse/master'
2016-01-29 11:17:55 +01:00
Kai Zimmermann
afd38cb6b8
Added further sonar inks
2016-01-29 11:06:33 +01:00
Kai Zimmermann
9cf345b15d
Fix sonar link
2016-01-29 10:52:58 +01:00
venu1278
9115b01461
MECS-1454_Search_filter_improvements
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-01-29 14:07:45 +05:30