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

1474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melanie Retter
36fb2f2b54 Merge branch 'master' into 
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-19 14:29:15 +02:00
Michael Hirsch
3650b31c9e Merge pull request #273 from bsinno/fix-improve-code-quality 
Minor code improvements
 2016-08-19 13:22:12 +02:00
Dominic Schabel
01d5d5e931 Merge branch 'master' into fix-improve-code-quality 
# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-19 12:33:46 +02:00
Gaurav
a6345270f5 Merge branch 'master' into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 11:20:11 +02:00
Gaurav
b2c1e78c72 Fixed the sonar issues 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 11:17:18 +02:00
Gaurav
b80323caf9 Re-factored the code as per the sonar standards. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 10:44:12 +02:00
Michael Hirsch
9610c83085 Merge pull request #271 from bsinno/fix_upload_status_dialog_showing_all_files 
add files to status dialog when receive upload
 2016-08-19 08:22:09 +02:00
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
SirWayne
4585c55689 Set closable to false that to disable 1 cross 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-18 15:32:25 +02:00
SirWayne
d05b5ebc1f Rename builder methode for TextComponent. Fix to set textfield ids. 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-18 11:15:00 +02:00
Michael Hirsch
630cf09162 add files to status dialog when receive upload 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-18 08:42:55 +02:00
Gaurav
b301f73aa4 # WARNING: head commit changed in the meantime 
Signed-off-by:
 2016-08-17 18:11:27 +02:00
Gaurav
c6c76332c0 Fixed the bug for textfield stays highlighted in red in the add 
distribution window.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-17 18:05:35 +02:00
Dominic Schabel
b409e831f1 Merge branch 'master' into fix-improve-code-quality 2016-08-17 18:01:22 +02:00
Gaurav
47726690c4 # WARNING: head commit changed in the meantime 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-17 17:42:06 +02:00
Gaurav
fafaf54e37 Refactored the code to fix the sonar issues. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-17 17:36:45 +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
SirWayne
e6f80756f1 Merge from master 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-17 09:34:59 +02:00
SirWayne
7ea17c54f1 Add TextBuilderArea 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-17 09:02:04 +02:00
SirWayne
8d7cdb7e13 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 17:33:27 +02:00
SirWayne
1d825f9c74 Add a textfield builder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 17:33:06 +02:00
Melanie Retter
3e0c78e832 Remove unnecessary style from ActionButtonLayout of CommonDialogWindow 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-16 17:28:37 +02:00
Dominic Schabel
1094c3c12f Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 16:11:15 +02:00
Dominic Schabel
876c599617 Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 15:28:59 +02:00
SirWayne
6db64dd5df Merge master 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:27:45 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into 
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 15:17:30 +02:00
SirWayne
9545ff5626 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 14:51:42 +02:00
SirWayne
8ccc9811a8 Add LabelBuilder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 14:51:36 +02:00
SirWayne
a51bf0ac02 Add LabelBuilder 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 14:38:21 +02:00
Dominic Schabel
5e48569462 Found another place where a NOT was missing 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 13:41:15 +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
Dominic Schabel
9e1754126e Added missing NOT and did some small other code improvements 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 12:53:27 +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
SirWayne
d3d07046ec Add a WindowBuilder for the dialogs 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 11:47:24 +02:00
SirWayne
4e7f547392 Add a WindowBuilder for the dialogs 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-16 11:46:42 +02:00
Dominic Schabel
ce2bdf82df Ignored test removed 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-16 09:47:21 +02:00
Dominic Schabel
a9e15041d8 Minor code improvements 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-08-15 18:16:55 +02:00
Gaurav
75905472c8 Fix for the dialog window must not close after save if duplicate exists. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-15 15:38:08 +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
Dominic Schabel
3accac9ade Minor code improvements 
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
 2016-08-15 13:17:37 +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