Commit Graph

214 Commits

Author SHA1 Message Date
asharani-murugesh
e0e86e72b4 merged master
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-27 12:51:23 +01:00
Michael Hirsch
07bf7e65bb Merge pull request #51 from bsinno/REFACTORING_CLEAN_CODE
ok this refactorings are aligned with the hawkbit sonar ruleset, merging.
2016-02-25 17:06:33 +01:00
asharani-murugesh
f8914e9737 Rollout list view : Removed Id column
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 16:31:42 +01:00
asharani-murugesh
f9dde70341 grid column resize : intermediate solution
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 16:27:19 +01:00
SirWayne
dbf03dca12 Add the "@Override" annotation
Add some description to JUnit Tests
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-25 11:37:56 +01:00
SirWayne
fcd6555e3e Fix diamond operator
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-24 18:24:53 +01:00
Michael Hirsch
ca66932918 Merge pull request #44 from bsinno/clearing_the_search_field_should_keep_the_focus
ok merging.
2016-02-24 14:47:30 +01:00
Michael Hirsch
0d81797ebf Merge pull request #48 from bsinno/remove-runtime-dep-sasscompiler
ok merged.
2016-02-23 15:57:43 +01:00
Michael Hirsch
275d929607 Merge pull request #49 from bsinno/update-spring-boot
ok merging.
2016-02-23 15:56:48 +01:00
Kai Zimmermann
1db0d6a5e9 Upgraded to newer jackson and hibernate validator version 2016-02-23 13:10:33 +01:00
Kai Zimmermann
6a5a3f2188 Cleaned up code 2016-02-23 11:34:36 +01:00
Kai Zimmermann
8507ae2bd3 Moved java version on top 2016-02-23 11:14:48 +01:00
asharani-murugesh
d6c6712af7 setting id for distribution bar
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-23 09:08:07 +01:00
asharani-murugesh
d0376aeafc Merge branch 'master' into Rollout_migrate_table_to_grid 2016-02-22 15:50:18 +01:00
asharani-murugesh
64d7a7b250 Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com> 2016-02-22 15:49:24 +01:00
asharani-murugesh
79d615dd3b Column expand ratio changes
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-22 15:36:02 +01:00
Kai Zimmermann
713922d762 Remove broken spring property usage for vaadin caching 2016-02-22 12:21:14 +01:00
Kai Zimmermann
cf3adaac63 Cleaned up POM 2016-02-22 12:20:56 +01:00
asharani-murugesh
8bef00496c Rollout -added new custom label renderer
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-22 11:30:01 +01:00
Kai Zimmermann
13345406ee Upgraded 3rd party libs 2016-02-22 11:01:47 +01:00
Kai Zimmermann
b9a2e155fd Removed runtime dependencies to sass compiler package 2016-02-21 20:50:21 +01:00
Michael Hirsch
1ede39fb45 Merge pull request #47 from bsinno/fix-vaadin-productionmode
confirmed, ok merging
2016-02-19 17:40:38 +01:00
asharani-murugesh
5d7d33d1da Distribution bar : tooltip changes
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-19 16:39:13 +01:00
Kai Zimmermann
6b143d6016 Fixed production mode path 2016-02-19 16:30:38 +01:00
Kai Zimmermann
878af52bc2 Add sonar_lock to git ignore 2016-02-18 12:13:48 +01:00
asharani-murugesh
af1503e390 Rollout group and targets grid view
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-18 12:07:50 +01:00
asharani-murugesh
f934ddc175 merged master
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-18 12:00:08 +01:00
Michael Hirsch
de8c1f179e Merge pull request #45 from bsinno/DistributionSetAssignmentResult-consistency-fix
ok, merging. Thanks.
2016-02-18 10:43:24 +01:00
Kai Zimmermann
b6509750bc Removed broken javadoc.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-18 10:22:21 +01:00
Kai Zimmermann
1c6223ba5d Improved readibility
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-18 10:12:36 +01:00
asharani-murugesh
46ad5da0cc Rollout list view - table to grid initial commit
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-18 09:47:52 +01:00
asharani-murugesh
00aad9880a custom render changes
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-17 14:16:47 +01:00
Kai Zimmermann
8b9f0d57dc Create README.md 2016-02-17 14:00:33 +01:00
Kai Zimmermann
01b75fc932 Removed unnecessary entitygraph usage.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-17 09:57:07 +01:00
Kai Zimmermann
3334cf4a64 Updated test
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-17 08:36:36 +01:00
venu1278
52fee2b2df Drag and drop handles wrong item
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-02-17 13:01:05 +05:30
Kai Zimmermann
8a14cca0a9 Merge branch 'DistributionSetAssignmentResult-consistency-fix' of https://github.com/bsinno/hawkbit.git into DistributionSetAssignmentResult-consistency-fix 2016-02-16 17:38:03 +01:00
Kai Zimmermann
6a2b74e565 Enabled target.assignedDs load through action enitygraph.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 17:37:34 +01:00
Kai Zimmermann
38b750f674 DistributionSetAssignmentResult contains actions that do not reflect the
status on the DB. Needs to be avoided by returning actions IDs only and
force the user to query an updated action entity.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 17:37:06 +01:00
asharani-murugesh
7a41aef8f0 custom renderer
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-16 15:01:54 +01:00
Kai Zimmermann
e3801e9e56 DistributionSetAssignmentResult contains actions that do not reflect the
status on the DB. Needs to be avoided by returning actions IDs only and
force the user to query an updated action entity.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-02-16 13:48:52 +01:00
venu1278
65a49545b1 Merge branch 'master' into MECS-1277_clearing_the_search_field_should_keep_the_focus 2016-02-16 15:58:05 +05:30
venu1278
600a16def8 Clearing the search field should keep the focus
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-02-16 15:52:04 +05:30
Michael Hirsch
2ef04bb437 Merge pull request #41 from bsinno/custom-target-filter-bug-fixes
👍 ok merging.
2016-02-15 13:13:30 +01:00
Michael Hirsch
7b79010fbf format sources with correct formatter.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-15 12:32:12 +01:00
Michael Hirsch
e8a2c7566c Merge pull request #43 from bsinno/Drag_and_Drop_handles_wrong_item
👍  is ok merging.
2016-02-15 12:12:05 +01:00
Michael Hirsch
21114a731d Merge pull request #42 from bsinno/EMPTY_CONTROLLER_ID
👍 is ok merging.
2016-02-15 12:11:41 +01:00
venu1278
caad1b7a10 Merge branch 'master' into MECS-911_Drag_and_Drop_handles_wrong_item 2016-02-15 15:55:36 +05:30
venu1278
ce05ef93c0 Merge branch 'master' into MECS-1277_clearing_the_search_field_should_keep_the_focus 2016-02-15 15:54:03 +05:30
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