lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
2,276 Commits 1 Branch 0 Tags
87eadf59cd42f2256d13d76bca09b9e68e3ff64a
Commit Graph

2276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Zimmermann
1ae3b4bcbb Upgrade Spring AMQP to 1.6.1 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-07-20 11:45:53 +02:00
GAH6KOR
b92794c5ef Merge branch 'feature_multiunassignment_soft_mod' of https://github.com/bsinno/hawkbit/ into feature_multiunassignment_soft_mod 2016-07-20 11:02:24 +02:00
GAH6KOR
79823b2930 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-20 11:01:15 +02:00
Kai Zimmermann
2ad5d8cfb1 Added feature to query by last target poll. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-07-20 10:34:19 +02:00
Michael Hirsch
03fecba57d Merge branch 'master' into feature_ui_metadata 2016-07-19 19:12:31 +02:00
Michael Hirsch
9ac4bbcc54 Merge pull request #250 from bsinno/fix_initial_tenant_creation 
remove cacheable on initial tenant creation
 2016-07-19 18:35:56 +02:00
Michael Hirsch
fe0a719ede remove cacheable on initial tenant creation 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-19 18:01:06 +02:00
gah6kor
85e22da7a2 Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
 2016-07-19 16:38:52 +02:00
Michael Hirsch
2411faf1f2 Merge pull request #249 from bsinno/fix_initial_tenant_creation 
don't return null on isAuthenticated method is boolean
 2016-07-19 16:35:30 +02:00
gah6kor
8e98b5a8e2 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-19 16:12:01 +02:00
gah6kor
01d2cc8422 Merge branch 'master' into feature_enable_push_in_deployment_view 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
 2016-07-19 16:09:47 +02:00
Michael Hirsch
d1c889bf16 don't return null on isAuthenticated method is boolean 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-19 15:51:22 +02:00
Kai Zimmermann
ba177f77c0 Merge pull request #222 from bsinno/Fix_Consistent_context_menu_on_tables 
Fix consistent context menu on tables
 2016-07-19 14:50:02 +02:00
Michael Hirsch
f540f4c1e2 Merge pull request #247 from bsinno/fix_initial_tenant_creation 
fix invalidating correct caches when update tenant metadata
 2016-07-19 13:56:51 +02:00
Michael Hirsch
cc986fe6f0 fix invalidating correct caches when update tenant metadata 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-19 13:35:47 +02:00
gah6kor
ffb29206fd Merge branch 'master' into feature_ui_metadata 2016-07-19 12:43:36 +02:00
gah6kor
39a2e3ab20 Removed the discard and maximize buttons 2016-07-19 12:42:16 +02:00
Kai Zimmermann
c360f01e2b Merge pull request #246 from bsinno/fix_initial_tenant_creation 
Fix initial tenant creation
 2016-07-19 08:36:46 +02:00
gah6kor
a87a219540 Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
 2016-07-18 18:10:09 +02:00
Michael Hirsch
bcfc10adab Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-18 16:30:51 +02:00
gah6kor
63884c9fcd Formatted the code 2016-07-18 16:15:30 +02:00
gah6kor
196596e8da Merge branch 'feature_ui_metadata' of https://github.com/bsinno/hawkbit/ into feature_ui_metadata 2016-07-18 16:13:58 +02:00
gah6kor
863e340067 Formatted the code 2016-07-18 16:01:49 +02:00
gah6kor
8200ca6da1 Formatted the code 2016-07-18 15:58:05 +02:00
gah6kor
56616be58d Formatted the code 2016-07-18 15:08:11 +02:00
gah6kor
1cef0b4d46 Fix for the max assignments. 2016-07-18 15:04:41 +02:00
Michael Hirsch
e54ec22a83 remove the current tenant cache evict when delete tenant 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 13:37:33 +02:00
Michael Hirsch
ecf59fd0b6 add test description 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 13:05:38 +02:00
Michael Hirsch
0c2604d1a1 add unit test for initial creating tenant without security context 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 13:03:39 +02:00
Michael Hirsch
3b5bcd46d8 add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 12:57:54 +02:00
Michael Hirsch
d2cd13996a fix initial creation of tenant when no current tenant and caching fix 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 12:48:50 +02:00
gah6kor
205de032e1 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-18 11:17:56 +02:00
gah6kor
ed830dd728 Formatted the code 2016-07-18 11:16:56 +02:00
gah6kor
834dbc9e81 Fixed Css issues 2016-07-18 11:08:23 +02:00
Kai Zimmermann
60efc6eedc Merge pull request #243 from bsinno/fix_button_color 
Correct colour of cancel/save button in DialogWindows
 2016-07-18 10:39:22 +02:00
kaizimmerm
624d9491d0 Removed enable auto configure from repo config 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-07-16 20:17:44 +02:00
Melanie Retter
40f58e4b3a Refactor methodname and method call order 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 17:46:54 +02:00
Melanie Retter
9890a1d018 Insert space between buttons and window bottom 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 17:39:51 +02:00
Melanie Retter
bcc526e891 Add colored style to action buttons 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 16:47:02 +02:00
Melanie Retter
c8f307cf33 Correct the button's style on rollout view 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 16:25:02 +02:00
gah6kor
86427acd5f Adding the missing header 2016-07-15 16:07:02 +02:00
gah6kor
bdf28f75bf Merge branch 'master' into feature_ui_metadata 2016-07-15 14:42:37 +02:00
gah6kor
db753b5c3d Merge branch 'master' into feature_ui_metadata 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/resources/messages_en.properties
	
Resolved the conflicts.
 2016-07-15 14:40:55 +02:00
Melanie Retter
0244c1ded1 Force quit is disabled if action is not forced but is canceled 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 13:34:39 +02:00
Melanie Retter
ef76488a53 Changed class name, and refactored the style logic (set / add style) 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-15 12:37:28 +02:00
Kai Zimmermann
015f88a54f Merge pull request #238 from bsinno/feature_traffic_tenant_stats 
Traffic data in DownloadProgress event
 2016-07-15 11:01:08 +02:00
Kai Zimmermann
5d3ba2a4b4 Merge pull request #241 from bsinno/bug_wrong_option_in_smtype_assign_max 
Changed if statement of how we distinguish if a softwareModule type i…
 2016-07-15 10:01:41 +02:00
gah6kor
b117fb0657 Fix for jenkins build failure 2016-07-14 17:44:43 +02:00
Melanie Retter
d87aaf2141 Delete css style for default-color 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-14 14:48:50 +02:00
Melanie Retter
1ff13a39df Correct colour of cance/save button in CommonDialogWindow 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-07-14 14:28:23 +02:00