Melanie Retter
40c7b6f0f7
Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs
2016-06-01 10:33:46 +02:00
Melanie Retter
5208aa2dea
change color save/cancel buttons
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-06-01 10:33:28 +02:00
Asharani
f26d240f38
Reverting commit d3f7b9d - on behalf of venu
...
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com >
2016-06-01 11:17:50 +05:30
Asharani
2b58fe96a6
Merge branch
...
'fix_introduce_consistent_button_position_in_change_dialogs' of
https://github.com/bsinno/hawkbit into
fix_introduce_consistent_button_position_in_change_dialogs
Conflicts:
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
2016-06-01 10:57:07 +05:30
Asharani
3b04512224
Reverting commit on behalf of Venu
...
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com >
2016-06-01 10:46:38 +05:30
Melanie Retter
f41e55b92d
Added IDs for save and cancel button
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-31 16:29:52 +02:00
Melanie Retter
cf64d2ffdf
css style change
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-31 10:53:07 +02:00
Melanie Retter
05e1347292
Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs
2016-05-30 18:27:04 +02:00
Melanie Retter
2dfda701b5
add license text
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-30 18:26:52 +02:00
Melanie Retter
b4e1839b3d
add license text
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-30 18:08:52 +02:00
Melanie Retter
f1533a7f1e
Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs
2016-05-30 17:50:19 +02:00
Melanie Retter
0b1782e946
add default value for optionGroup; optimize UI
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-30 17:50:03 +02:00
venu1278
85b8e1ffe0
Merge branch 'master' into fix_introduce_consistent_button_position_in_change_dialogs
2016-05-30 17:59:31 +05:30
venu1278
d3f7b9de9c
Displaying Metadata details of DistributionSet & SoftwareModule
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-05-30 17:57:40 +05:30
Melanie Retter
6fd24416ae
substitute VerticalLayout for FormLayout
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-30 12:37:39 +02:00
Melanie Retter
2d474c17ee
Merge remote-tracking branch 'origin/master' into fix_introduce_consistent_button_position_in_change_dialogs
2016-05-30 12:35:12 +02:00
Kai Zimmermann
2a6b531bff
Merge remote-tracking branch 'origin/master'
2016-05-26 10:41:09 +02:00
venu1278
f1a1538177
Merge branch 'master' into fix_introduce_consistent_button_position_in_change_dialogs
2016-05-26 12:06:12 +05:30
Melanie Retter
3abfe388a4
optimize CommonDialogWindow
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-25 18:55:43 +02:00
Melanie Retter
6c7f0482b4
Insert helpLink next to the action buttons on the right side
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-25 13:28:58 +02:00
Michael Hirsch
7b20122f09
Merge pull request #189 from bsinno/fix_widgetset_clean_recompilation
...
move widgetset to src/main/resources and remove cleaning of widgeset
2016-05-25 12:22:46 +02:00
Kai Zimmermann
608ffcecf4
Merge pull request #162 from bsinno/fix_create_filter_has_different_layout_than_rollout_and_the_other_widgets
...
Create filter has different layout than rollout and the other widgets
2016-05-24 18:08:09 +02:00
Melanie Retter
96baddeaee
optimize commonDialogWindow.
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-24 17:21:51 +02:00
Kai Zimmermann
d59ebaebd8
Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
...
Feature/add rest api with java client
2016-05-24 16:11:25 +02:00
SirWayne
c06c2e546e
Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client
2016-05-24 15:08:33 +02:00
SirWayne
dc74ec8889
Some rework for the pull request
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-24 15:08:07 +02:00
Michael Hirsch
18c8f55f62
Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client
2016-05-24 10:48:25 +02:00
Michael Hirsch
ee6566081b
adding or fix javadoc
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-24 10:48:17 +02:00
SirWayne
57153b1244
Remove commons.lang 2.3
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-24 10:45:07 +02:00
Michael Hirsch
1fa335dedd
fix license header in pom file
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-20 15:35:15 +02:00
Michael Hirsch
fe1e2f74e7
exclude compiled vaadin widgetset from license check
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-20 14:25:03 +02:00
Michael Hirsch
47e254e14e
move widgetset to src/main/resources and remove cleaning of widgeset
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-20 13:56:36 +02:00
Melanie Retter
5213d7ce21
New Parent class CreateUpdateTypeLayout for modal dialogs Create/Update
...
type
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-20 11:01:54 +02:00
Melanie Retter
61a53d874a
Optimize
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-20 11:01:09 +02:00
SirWayne
f9ed3b305d
Move annotation
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-19 18:28:09 +02:00
Michael Hirsch
088da91fde
fix typo in readme.md
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-19 17:21:10 +02:00
Michael Hirsch
355218f7b7
Merge pull request #185 from bsinno/fix_flashing_whitepage_on_login_application
...
fix_flashing_whitepage_on_login_application
2016-05-19 14:02:28 +02:00
Michael Hirsch
08f0a9837f
Merge pull request #184 from bsinno/fix_display_DSNameVersion_actionhistory_table
...
Fix display ds name version actionhistory table
2016-05-19 14:02:08 +02:00
Michael Hirsch
32ae3b7233
Merge pull request #183 from bsinno/feature_switch_back_boot_logback
...
Switch back Spring Boots default logger implementation logback
2016-05-19 13:23:56 +02:00
Michael Hirsch
5f8a2bebef
add license header to logback.xml
...
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com >
2016-05-19 12:57:32 +02:00
venu1278
22746ed87e
Merge branch 'master' into fix_flashing_whitepage_on_login_application
2016-05-19 15:57:35 +05:30
venu1278
f345d5068f
fix_flashing_whitepage_on_login_application
...
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com >
2016-05-19 15:56:19 +05:30
SirWayne
176f190ec6
Update docu and readme.md
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-19 10:15:02 +02:00
Melanie Retter
4387c8203b
optimize ColorPickerLayout
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-19 09:57:43 +02:00
Jonathan Philip Knoblauch
fcd6cef3fb
Updated readme.md due to changes modules structure
...
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com >
2016-05-18 16:16:11 +02:00
Jonathan Philip Knoblauch
c9248a80db
Updated readme.md for changes module names
...
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com >
2016-05-18 16:05:10 +02:00
SirWayne
27721c7cf8
Move Ddi client
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-18 15:39:47 +02:00
Michael Hirsch
88dc9cac3d
Merge pull request #186 from bsinno/fix_device_simulator_ui_npe
...
the column name must be the same as the bean attribute name otherwise NPE
2016-05-18 15:37:01 +02:00
SirWayne
f02485129e
Extend migration guide
...
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com >
2016-05-18 15:24:28 +02:00
Melanie Retter
a10506f94b
Implementing commonDialogWindow
...
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com >
2016-05-18 15:15:32 +02:00