Commit Graph

91 Commits

Author SHA1 Message Date
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
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
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
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
Kai Zimmermann
0395ed42f1 Added build status 2016-01-28 18:30:53 +01:00
Kai Zimmermann
d7cf777649 Merge remote-tracking branch 'eclipse/master' 2016-01-28 17:39:11 +01:00
Kai Zimmermann
38c3498a73 Fixed parent version 2016-01-28 17:32:27 +01:00
Kai Zimmermann
474792f124 Fixed parent version 2016-01-28 17:30:52 +01:00
SirWayne
877cb1ee24 Remove @Value annotation and use inner configuration properties to set
the default value.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-01-28 15:29:31 +01:00
Kai Zimmermann
9c3333ec24 Merge remote-tracking branch 'eclipse/master' 2016-01-28 13:52:52 +01:00
Michael Hirsch
327516a52e Merge pull request #13 from bsinno/remove-ununsed-methods
Remove unused methods
2016-01-28 12:12:13 +01:00
Kai Zimmermann
ee97196dce Merge remote-tracking branch 'eclipse/master' into remove-ununsed-methods 2016-01-28 11:42:02 +01:00
Kai Zimmermann
6626c2f7c1 Merge pull request #7 from bsinno/device_simulator_ui_vaadin
+1 from me
2016-01-28 11:33:52 +01:00
Michael Hirsch
a27a770b6a removing the default value from the @Value annotation, seems like is not
working overwriting the default value with profiles. Removing the
default value, it is possible again to overwrite the default value
again.
2016-01-28 10:35:26 +01:00
Kai Zimmermann
2072d0b555 Merge remote-tracking branch 'eclipse/master' 2016-01-28 09:52:39 +01:00
Kai Zimmermann
793b198338 Merge pull request #12 from bsinno/MECS-1444-CREATE_UNIT_TEST_FOR_ENUM_FIELDS
merged
2016-01-28 09:50:18 +01:00
Kai Zimmermann
59d1fcaf84 Applied hawkBit code format 2016-01-27 15:06:37 +01:00