Commit Graph

1253 Commits

Author SHA1 Message Date
Michael Hirsch
3e4f76cca6 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-22 15:16:38 +02:00
Michael Hirsch
adb60156f8 Merge pull request #254 from bsinno/add_hawkbit_logo_to_readme
Add hawkbit logo to readme
2016-07-21 09:39:19 +02:00
Michael Hirsch
af00f3aa1b resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:32:53 +02:00
Michael Hirsch
2fe670b57f resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:27:04 +02:00
Michael Hirsch
d12bd8c2db try out image tag for resize
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:26:10 +02:00
Michael Hirsch
4bc5bb2dd3 Merge pull request #253 from bsinno/fix_initial_tenant_creation
remove caching from jpa_system_management
2016-07-20 19:35:26 +02:00
Michael Hirsch
b04755eda8 remove caching from jpa_system_management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 18:05:21 +02:00
Michael Hirsch
5a6d656b75 add hawkbit logo to readme.md
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 16:51:01 +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
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
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
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
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
Michael Hirsch
bcfc10adab Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-18 16:30:51 +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
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
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
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
gah6kor
f18a7f6d75 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-14 13:31:28 +02:00
gah6kor
e67a466b2c Addded multi unassign buttons for the software modules. 2016-07-14 13:27:45 +02:00
Melanie Retter
48561b2028 Merge remote-tracking branch 'origin/master' into
Fix_Consistent_context_menu_on_tables

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-13 18:07:50 +02:00
Jonathan Philip Knoblauch
7be2eea2db Changed if statement of how we distinguish if a softwareModule type is a firmware or a software
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-07-13 16:55:10 +02:00
Michael Hirsch
84e5361a82 Merge pull request #240 from bsinno/fix_sonar_critical_issues
fix sonar critical issues
2016-07-13 09:07:29 +02:00
Michael Hirsch
2f9a9b456d fix sonar critical issues
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-13 08:41:59 +02:00
Kai Zimmermann
af7246b901 Merge pull request #239 from bsinno/feature_system_code_generally_access
Add IS_SYSTEM_CODE to all springEvalExpr and remove explicit usage
2016-07-08 14:24:13 +02:00
Michael Hirsch
d0cf8a40bd fix javadoc link
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-08 13:32:02 +02:00
kaizimmerm
9a4903526a Removed percentage from the event. Moved event into the repo API.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-08 13:00:47 +02:00
Michael Hirsch
c3586b0230 remove double ended semicolon
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-08 10:20:37 +02:00