Commit Graph

689 Commits

Author SHA1 Message Date
Kai Zimmermann
6e85c724bf Removed the method exception from transaction manager as they where not
needed anymore. The bean in systemmanagement should also not open a
transaction.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-25 14:09:38 +02:00
Michael Hirsch
13f2c36409 Merge pull request #146 from bsinno/Bug/Show_User_Information
Bug/show user information
2016-04-22 13:52:02 +02:00
SirWayne
51a00c4165 Merge branch 'Bug/Show_User_Information' of https://github.com/bsinno/hawkbit into Bug/Show_User_Information 2016-04-21 17:58:32 +02:00
SirWayne
9e6a26d482 Merge branch 'master' into Bug/Show_User_Information
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 17:55:07 +02:00
SirWayne
ef46062df3 Merge branch 'eclipse/master' of local repository 2016-04-21 17:46:37 +02:00
SirWayne
f7b30a59ba Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 16:58:08 +02:00
SirWayne
ffd3373b34 Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 11:53:54 +02:00
Michael Hirsch
d120d7b7f0 Merge pull request #149 from bsinno/fix_rollout_renderer
fix rollout renderer, using wrong itemd ID property naming
2016-04-21 08:47:19 +02:00
Michael Hirsch
d561ad99de fix rollout renderer, using wrong itemd ID property naming
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-21 08:06:10 +02:00
Jonathan Philip Knoblauch
1220b490f8 Small fix since checkbox was using wrong item for enabling
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-20 16:15:03 +02:00
Michael Hirsch
b1291679b2 Merge pull request #142 from bsinno/Rollout_Management_issues_refactor
Rollout management issues refactor
2016-04-20 14:13:51 +02:00
Dennis Melzer
5027b36c59 Update SPDateTimeUtil.java 2016-04-20 12:49:50 +02:00
Dennis Melzer
681a23e51d Update UserDetailsFormatter.java 2016-04-20 12:31:32 +02:00
SirWayne
3c454bfb9b Modfiy username formatting
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 11:27:33 +02:00
venu1278
86e313fc29 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-19 14:47:31 +05:30
SirWayne
5437f36c75 Rename deadletter queue and add ttl
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 10:42:56 +02:00
SirWayne
702decee62 Rename deadletter queue and add ttl
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 10:42:29 +02:00
venu1278
5b0da33c2c Merge branch 'master' into Rollout_Management_issues_refactor 2016-04-18 20:13:28 +05:30
venu1278
f290eb78e5 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-18 20:12:30 +05:30
SirWayne
d49546e71f Add tooltip for username
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-18 16:17:28 +02:00
Michael Hirsch
c76ab23dc5 Merge pull request #133 from bsinno/Client_side_debug_added_documentation
Added documentation for client side debugging
2016-04-18 08:37:15 +02:00
Michael Hirsch
c7c641ddf6 Merge pull request #136 from bsinno/ddi-sim-only
Send DMF message only in case of DMF sim.
2016-04-18 08:02:42 +02:00
Michael Hirsch
878c5c869c adapt hawkBit user interface sentence
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:54:38 +02:00
Michael Hirsch
8eac737219 update javadoc and remove author from it
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:47:23 +02:00
Michael Hirsch
fd7fb7bd01 make use of the existencechecking annotation for targetrolloutgroup
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:41:33 +02:00
Michael Hirsch
5fd220a5e3 change transaction handling of creating groups and check running
Rollouts

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-16 10:42:26 +02:00
SirWayne
2462c7b6bf Add javadoc
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-15 17:47:02 +02:00
SirWayne
536098c4c7 Load and format the user details by a user detail formatter
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-15 17:40:03 +02:00
venu1278
6046e9b41d Merge branch 'master' into Rollout_Management_issues_refactor 2016-04-15 15:23:19 +05:30
venu1278
b9c389d8db Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-15 15:22:16 +05:30
Michael Hirsch
72d9d11199 Merge pull request #143 from bsinno/fix_check_if_target_has_assigned_local_artifact
fix lookup by filename and not by ID
2016-04-14 13:57:16 +02:00
Michael Hirsch
2ca807916c fix lookup by filename and not by ID because the ID is unique and the
filename exists multiple times

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-14 13:32:24 +02:00
venu1278
20c045f997 Merge branch 'master' into Rollout_Management_issues_refactor 2016-04-14 14:50:38 +05:30
venu1278
c8e88239c2 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-14 14:49:49 +05:30
Michael Hirsch
ad50f1abde Merge pull request #138 from bsinno/Bug/UI_NPE_Drag_And_Drop
Fix null handling for all drag and drop table
2016-04-14 10:22:35 +02:00
Michael Hirsch
e651be3a9b Merge pull request #134 from bsinno/Add_Missing_Event
Add missing TargetTagDeletedEvent
2016-04-14 10:22:25 +02:00
venu1278
723b0770bb Merge branch 'master' into Rollout_Management_issues_refactor 2016-04-14 11:25:11 +05:30
venu1278
6b32118f93 Merge branch 'master_copy_to_merge_rollout_issues' into
Rollout_Management_issues_refactor

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
2016-04-14 11:23:33 +05:30
Asharani Murugesh
fc693f0994 Corrected the typo as per review comment 2016-04-14 09:54:56 +05:30
SirWayne
4b6a6a4a4a Refactoring: Extract some staff to private methods and remove duplicated
code

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 17:37:55 +02:00
SirWayne
30ba98ff8e TTL
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 17:27:49 +02:00
Michael Hirsch
2a5b1c2fbb Merge pull request #141 from bsinno/Bug/Upload_Artifact
Bug/upload artifact
2016-04-13 16:52:40 +02:00
SirWayne
d21485cad4 Refactoring: Extract some staff to private methods
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 16:52:12 +02:00
SirWayne
46e71f622d Version should be set after id
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 15:47:08 +02:00
SirWayne
f70120d546 Set the id after the update
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 15:36:14 +02:00
SirWayne
b95b9c1ce6 Move @SuppressWarnings("unchecked") to the right line and remove unused
attributes

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 14:20:27 +02:00
SirWayne
ee0fc26678 TTL
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-13 14:10:28 +02:00
Michael Hirsch
e9a8d95e6f Merge pull request #140 from bsinno/Bug/Upload_Artifact
Bug/upload artifact
2016-04-13 11:21:34 +02:00
Michael Hirsch
d052bef5d7 Merge pull request #139 from bsinno/fix_artifact_multiple_assignment_sha1_hash_lookup
fix the lookup of artifacts which exists multiple times with same lookup key e.g. SHA1
2016-04-13 11:20:24 +02:00
venu1278
67fd24e668 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-13 12:46:30 +05:30