lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
145 Commits 1 Branch 0 Tags
dff95dc332bcf1e84efb9d01db2443401dbe3e80
Commit Graph

145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
venu1278
dff95dc332 Merge branch 'master' into 
MECS-1277_clearing_the_search_field_should_keep_the_focus

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
 2016-02-15 15:51:19 +05:30
venu1278
7fe23aa8a0 clearing the search field should keep the focus. 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-02-12 14:34:17 +05:30
Michael Hirsch
d8a0a7f8e4 fix accessing the with this causes NPE use UI.getCurrent 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-11 19:53:06 +01:00
Michael Hirsch
145ae2e6aa Merge pull request #37 from bsinno/fix_target_filter_access_ui_thread 
Fix target filter access ui thread
 2016-02-11 17:30:43 +01:00
Michael Hirsch
19fb5332ef fix accessing the UI thread when updating the total target label 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-11 17:07:18 +01:00
Michael Hirsch
5cb1952c80 Merge remote-tracking branch 'eclipse/eclipsemaster' 2016-02-10 14:10:15 +01:00
Michael Hirsch
6a93b15854 fixing newly created bug by trying to simplify if-statement with commit 
a4e1ae7ac8

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-10 12:43:54 +01:00
Michael Hirsch
ed5e985055 Merge branch 'master' of https://github.com/bsinno/hawkbit.git 2016-02-10 12:42:48 +01:00
Michael Hirsch
96bf5a8293 fixing newly created bug by trying to simplify if-statement with commit 
a4e1ae7ac8

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-10 12:42:37 +01:00
SirWayne
7e69ead138 Revert Clean Code Changes 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-10 08:47:12 +01:00
SirWayne
d685c48f52 Clean Code Refactoring 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-10 08:05:24 +01:00
Michael Hirsch
def3868ee0 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 18:42:31 +01:00
Michael Hirsch
0eadf537cc Merge pull request #30 from bsinno/feign_mgmt_api_client 
Feign mgmt api client
 2016-02-09 18:41:03 +01:00
Michael Hirsch
2fa6e2c05f fix license headers 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-09 18:18:39 +01:00
Michael Hirsch
17d815e1b6 add example mgmt-api-client powered by feign and spring-cloud. 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-09 17:49:24 +01:00
Michael Hirsch
81bf2df2d8 Merge remote-tracking branch 'refs/remotes/eclipse/master' 2016-02-09 14:51:58 +01:00
Michael Hirsch
5088b7fd9b Merge pull request #21 from bsinno/MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter 
NPE_when_user_tries_to_create_simple_targetfilter.
 2016-02-09 14:51:29 +01:00
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
venu1278
d045cba42a Merge branch 'master' into MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter 2016-02-08 12:20:15 +05:30
venu1278
79abaa856d MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
 2016-02-08 12:19:04 +05:30
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