Commit Graph

125 Commits

Author SHA1 Message Date
Michael Hirsch
d24e269e13 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 14:49:20 +01:00
Michael Hirsch
014a6f04f5 Merge pull request #29 from bsinno/Sonar_Fix_Rollout
Sonar fix rollout
2016-02-09 14:48:08 +01:00
SirWayne
b21f8f5c71 Clean Code Refactoring
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 13:36:58 +01:00
SirWayne
a4e1ae7ac8 Remove blocker issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 13:26:25 +01:00
Michael Hirsch
8ebaaef931 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 12:03:04 +01:00
Michael Hirsch
d0c9fc394d Merge pull request #27 from bsinno/Sonar_Fix_Rollout
Sonar fixes
2016-02-09 12:00:27 +01:00
Michael Hirsch
879b5df9ca Merge pull request #28 from bsinno/Custom_target_filter_bug_fixes
Custom target filter bug fixes
2016-02-09 11:58:53 +01:00
SirWayne
ceb23e65e4 Remove this for member variable
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 11:29:01 +01:00
asharani-murugesh
e6470e3e9f Bug fix - Custom target filter
- query text field loosing focus after query is typed 
- Icon disappears when query text is cleared 
- Customer Update view table - flickers with horizontal scroll bar

Rollout target list view:
-Modified the status icon color of 'cancelled' state

Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-09 11:07:34 +01:00
SirWayne
1bb29338ac Clean Code Refactoring
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-09 10:16:07 +01:00
Michael Hirsch
d9324db83e Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-08 12:04:54 +01:00
Michael Hirsch
f85c3b00b9 Merge pull request #26 from bsinno/MECS-1452_Support_additional_field_name_and_operators_in_search_query
Support additional field name and operators in search query
2016-02-08 09:45:04 +01:00
SirWayne
9ae2ef0bc0 Merge remote-tracking branch 'origin/code_style_sonar_rule_fixes' into Sonar_Fix_Rollout 2016-02-08 08:47:52 +01:00
SirWayne
4574c78908 Add SpecificationBuilder to avoid duplicate code
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-08 08:47:12 +01:00
Michael Hirsch
2a45fab9d7 make immediately return statement, not storing into local variable.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-08 08:46:50 +01:00
Michael Hirsch
d100e255c7 format TargetFields correctly, missig empty line.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-08 08:28:21 +01:00
Michael Hirsch
abf9136e7e format source code correctly and add javadoc to TargetFields.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-08 08:27:54 +01:00
Michael Hirsch
91e968cc8b Merge pull request #22 from bsinno/MECS-145_Minor_improvements_in_search_filter_New
Minor improvements in search filter and display total target count.
2016-02-05 16:07:09 +01:00
Michael Hirsch
a488a42cc9 code sonar rule cleanup of DistributionSetManagament
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-05 16:01:25 +01:00
venu1278
6e67fc2897 Merge branch 'master' into MECS-1454_Search_filter_improvements 2016-02-05 19:22:51 +05:30
venu1278
def0a00cf6 MECS-145_Minor_improvements_in_search_filter_New
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-02-05 19:21:27 +05:30
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
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