Commit Graph

1458 Commits

Author SHA1 Message Date
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
Dominic Schabel
b409e831f1 Merge branch 'master' into fix-improve-code-quality 2016-08-17 18:01:22 +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
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
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
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