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

1439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Hirsch
37faa151f0 Merge pull request #272 from bsinno/fix_toomany_status_entries_dont_requeue 
don't reject too many status entries exception
 2016-08-19 08:19:15 +02:00
Michael Hirsch
17a2000333 Merge pull request #269 from bsinno/feature_allow_disable_amqp_interface_in_simulator 
introduce property to disable amqp interface in simulator
 2016-08-17 10:05:59 +02:00
Michael Hirsch
a84a3b9dae Merge pull request #236 from bsinno/feature_enable_push_in_deployment_view 
Enable push for update target, create/update/delete ds
 2016-08-16 13:21:33 +02:00
Michael Hirsch
79e0cccfa9 remove not used class 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-16 12:29:14 +02:00
Michael Hirsch
7164b33e94 don't generate amqp devices at startup if amqp is disabled 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-15 15:33:18 +02:00
Michael Hirsch
9d54aa8c34 grammar corrected 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-15 15:16:02 +02:00
Michael Hirsch
196ce5643e don't send amqp message when protocol is DDI 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-15 14:33:03 +02:00
Gaurav
86f13452c5 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-15 11:42:03 +02:00
Michael Hirsch
d89b6993d4 Merge pull request #270 from bsinno/fix_lock_session_on_show_error_notification 
Show error notification needs a lock when run in separate thread
 2016-08-12 19:17:14 +02:00
Michael Hirsch
2cbe13c14f don't reject too many status entries exception 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-12 16:32:04 +02:00
Jonathan Philip Knoblauch
971b0aecb6 Refactoring error handler 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-12 16:08:44 +02:00
Jonathan Philip Knoblauch
5d250a03be Refactoring for error handler 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-12 14:28:25 +02:00
Michael Hirsch
e8393af749 adapt manifest 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-12 09:54:18 +02:00
Melanie Retter
c3145bed58 Refactor: Log message can be overwritten 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 17:51:39 +02:00
Melanie Retter
643eb23839 Revert method deletion 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 16:25:12 +02:00
Melanie Retter
92fb82129a Refactoring HawkbitUiErrorHandler 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 16:05:22 +02:00
Melanie Retter
0d632d598a Delete empty rows in Java Doc 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 14:33:34 +02:00
Melanie Retter
ff39ecfc75 Correct typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 14:15:19 +02:00
Gaurav
4534ece860 Fixed the issue of refreshing the tag details section for the 
distributions.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-11 14:03:40 +02:00
Melanie Retter
6205126279 Lock is only needed when BulkUpload 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:54:28 +02:00
Melanie Retter
3ec569f259 Merge branch 'fix_lock_session_on_show_error_notification' of 
https://github.com/bsinno/hawkbit.git into
fix_lock_session_on_show_error_notification

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:29:31 +02:00
Melanie Retter
9cc63ce128 Refactor UI Error Handler. Need to put UI in constructor. So the message 
is shown in the same browser window.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-11 13:25:24 +02:00
Michael Hirsch
25fb8e5514 introduce property to disable amqp interface in simulator 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-11 09:50:38 +02:00
Gaurav
0e6d21c84a Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-10 17:20:28 +02:00
Michael Hirsch
7f156f05a4 Merge pull request #268 from bsinno/fix_json_creator_ddideploymentbase 
add json-creator to DdiDeploymentBase
 2016-08-10 14:42:12 +02:00
Michael Hirsch
b53f4fc74f add json-creator to DdiDeploymentBase 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-10 14:42:03 +02:00
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view 
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-10 11:44:23 +02:00
Michael Hirsch
913692f947 lock session on error showing error notification 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-10 09:22:57 +02:00
Michael Hirsch
785dc5f208 Merge pull request #266 from bsinno/Feature_Improve_Code_Quality 
Improve code quality
 2016-08-10 08:07:51 +02:00
Michael Hirsch
8c39fc98e0 Merge branch 'master' into Feature_Improve_Code_Quality 2016-08-09 17:54:11 +02:00
Gaurav
894e9dc3cf Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-09 13:15:24 +02:00
Michael Hirsch
4baf8c6ce0 Merge pull request #267 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
Fix concurrency on ui causes nullpointer exception
 2016-08-09 11:51:14 +02:00
Michael Hirsch
df315bb42c remove tagToken from map 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-09 11:50:59 +02:00
Michael Hirsch
9cb1fe170b clear tagDetails in BulkUpload 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-09 11:50:18 +02:00
Dominic Schabel
d3edcb0044 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
 2016-08-09 09:02:33 +02:00
Michael Hirsch
c4c205ea27 Merge pull request #262 from bsinno/fix_enable_showing_errors_during_bulk_upload 
Fix enable showing errors during bulk upload
 2016-08-08 16:47:43 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
 2016-08-08 16:40:00 +02:00
Michael Hirsch
f4c642b401 Merge pull request #265 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
clear the tagDetails map as well
 2016-08-08 16:21:17 +02:00
Jonathan Philip Knoblauch
8a1207337b Changed buildNotification method that error log dosn't have to be displayed in all cases 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-08-08 16:15:55 +02:00
Michael Hirsch
adafaa9489 clear the tagDetails map as well 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-08 16:15:15 +02:00
Gaurav
8fa2a60a71 Formatted the code. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-08 13:30:16 +02:00
Gaurav
1afd98e157 Merge branch 'feature_enable_push_in_deployment_view' of https://github.com/bsinno/hawkbit/ into feature_enable_push_in_deployment_view 2016-08-08 13:25:13 +02:00
Gaurav
e42f8164a8 Incorporated the review comments. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-08 13:24:12 +02:00
Michael Hirsch
b3702672a3 add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-08 09:14:48 +02:00
Michael Hirsch
c4b0bdfa86 Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException 
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
 2016-08-08 08:49:21 +02:00
Michael Hirsch
d53517a0c9 Merge pull request #263 from bsinno/fix_entity_lock_exception_for_unassign_soft_module_from_DS 
Fix entity lock exception for unassign soft module from ds
 2016-08-08 08:46:39 +02:00
Michael Hirsch
06b361ea3c Merge pull request #261 from bsinno/fix_systemmanagement_security_annotation 
Fix systemmanagement security annotation
 2016-08-08 08:34:09 +02:00
SirWayne
9febe16453 Fix sonar issue 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 16:42:09 +02:00
Gaurav
88c1253f66 Fix for the concurrency issue on UI causes on the Nullpointer Exception. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-05 16:02:20 +02:00
SirWayne
5f20066cff Fix sonar issue 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 15:55:49 +02:00