lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
3,579 Commits 1 Branch 0 Tags
3e35d0c5c19b6f3c87c5a6720ebb5fd2b33ee0fb
Commit Graph

3579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SirWayne
c4fcdea0e0 Remove resouce loader 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-27 12:24:29 +02:00
SirWayne
8578f6726b Return last throwable in response 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-27 11:20:57 +02:00
Melanie Retter
02e2f67193 Merge remote-tracking branch 'origin/master' into fix_Introduce_consitent_button_icon_for_update_create_dialogs 2016-06-27 10:16:34 +02:00
AMU7KOR
22076aba8a Details : Disable 'manage metadata' icon when no row is selected 
Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-27 11:36:54 +05:30
AMU7KOR
f20140fbd5 Fixed compilation issue 
Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-27 11:30:02 +05:30
Kai Zimmermann
bfac03ae31 Merge pull request #227 from bsinno/fix_executor_and_exchange 
Fix executor service and created extra exchange for authentication requests.
 2016-06-25 21:00:14 +02:00
Kai Zimmermann
31440bba00 Merge pull request #225 from bsinno/Fix_wrong_multipart_exception_message_in_response 
Fix wrong multi part exception message in response.
 2016-06-25 20:51:38 +02:00
Michael Hirsch
a5ee301820 update javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-25 12:29:12 +02:00
Kai Zimmermann
c2bacd7d75 Merge pull request #224 from bsinno/fix_asychronous_tenant_aware_access 
use SecurityContext as thread local cause it's delegated through threads
 2016-06-24 20:55:52 +02:00
Melanie Retter
850b7c6828 fix enable save button problem when update 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-24 17:26:57 +02:00
Dennis Melzer
1e8ffb8b9e Update messages_en.properties 
Add properties

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-24 15:55:04 +02:00
Dennis Melzer
2c0c0d123c Update messages.properties 
Add properties

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-24 15:54:27 +02:00
kaizimmerm
6ef18fbe08 Merge remote-tracking branch 'origin/fix_asychronous_tenant_aware_access' into fix_executor_and_exchange 2016-06-24 15:30:40 +02:00
AMU7KOR
e5d4e7c560 Added permission check for create/update metadata 
Added 'cancel' button in metadata popup
Added show 'metadata' icon next to 'edit' icon

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java

Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-24 15:19:40 +02:00
AMU7KOR
a53a6c9f0c Added permission check for create/update metadata 
Added 'cancel' button in metadata popup
Added show 'metadata' icon next to 'edit' icon

Signed-off-by: AMU7KOR <Asharani.Murugesh@in.bosch.com>
 2016-06-24 15:15:20 +02:00
Kai Zimmermann
176e2d52c1 Metadata management for SM and DS in Management UI. 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-24 15:14:14 +02:00
Kai Zimmermann
796d3dda9c Metadata management for SM and DS in Management UI. 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-24 15:13:27 +02:00
SirWayne
82bdaf53ed Fix wrong multi part exception message in response. 
Hardening all exception message and classes in exception handler for
reponses

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-24 15:12:24 +02:00
Kai Zimmermann
651fb5256d Merge pull request #223 from bsinno/fix_resend_dmf_with_null_target_sec_token 
retrieve target-security-token with system-context permission
 2016-06-24 15:01:43 +02:00
Michael Hirsch
a5d84a47e0 code beautify 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 14:58:26 +02:00
Michael Hirsch
2150f45bde use SecurityContext as thread local because it's delegated throug 
threads

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 14:51:18 +02:00
kaizimmerm
06b6b254b5 Merge remote-tracking branch 'origin/fix_resend_dmf_with_null_target_sec_token' into fix_executor_and_exchange 2016-06-24 14:02:19 +02:00
kaizimmerm
23cb62b9d9 Fix scheduled executor, auth exchange and simulator poll. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-24 13:59:19 +02:00
Michael Hirsch
128585c95e fix test 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 12:38:46 +02:00
Michael Hirsch
0a36f23bb3 retrieve target-security-token with system-context permission 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 12:09:23 +02:00
Michael Hirsch
ef01a25750 javadoc first sentence missing dot 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 07:43:02 +02:00
SirWayne
3e4b866014 remove centeralign style from join column 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 17:41:44 +02:00
SirWayne
d0ad5ee0e4 Add id for soft action group button 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 16:11:48 +02:00
SirWayne
8e57eb6d26 Add action column for action history table and remove context menu 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-23 14:49:47 +02:00
Melanie Retter
a9ebb763f6 Add i18n to CommonDialogWindow constructor 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-23 11:25:32 +02:00
Kai Zimmermann
7857107b46 Merge pull request #217 from bsinno/feature_configurable_mgmt_sim_scenario 
Feature configurable mgmt sim scenario
 2016-06-23 10:08:21 +02:00
Michael Hirsch
b853dfc469 Merge pull request #221 from bsinno/feature_security_adaptions 
Feature security adaptions
 2016-06-23 10:06:25 +02:00
Melanie Retter
f567461993 correct save button enabled when changes exists. Changed lower/uppercase 
spelling

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-06-23 09:33:43 +02:00
kaizimmerm
bb1d3a2668 Remove whitespace. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-23 09:15:40 +02:00
kaizimmerm
fa2477f5cb Fixed nullpointer exception and optimized the code here and there. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-23 09:02:05 +02:00
Michael Hirsch
27005b1ae7 fix test 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 17:33:09 +02:00
SirWayne
15aa489273 Add action column in table 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-22 17:15:05 +02:00
Kai Zimmermann
3ea5069c8b Merge pull request #207 from bsinno/fix_Consitent_table_muliselect 
Select all table entries with "CTRL+A"
 2016-06-22 17:07:37 +02:00
Michael Hirsch
a11d2bc7f5 Merge branch 'master' into feature_security_adaptions 2016-06-22 15:49:14 +02:00
Michael Hirsch
11f2232247 add prefixed ROLE_ to granted authorities to work with out-of-the-box 
spring security

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 15:47:38 +02:00
Michael Hirsch
aef2e3450a remove special health security check because this can be made with 
spring security out-of-the box

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 15:46:43 +02:00
Michael Hirsch
bab32c86a7 Merge pull request #220 from bsinno/feature_add_security_evalexpr_system_monitor_permission 
add spring security eval expression for system_monitor permission
 2016-06-22 15:00:06 +02:00
Michael Hirsch
9226f514d2 add spring security eval expression for system_monitor permission 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 13:36:22 +02:00
Michael Hirsch
135dc8a2d1 Merge pull request #218 from bsinno/fix_jacoco_version_update 
update jacoco version
 2016-06-22 13:04:34 +02:00
Kai Zimmermann
717a23671e Propr rabbit client version handling in parent POM. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-22 12:31:35 +02:00
Kai Zimmermann
837b62758a Removed closed todo 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-22 12:24:52 +02:00
kaizimmerm
3d049fada1 Add DMF message correlation-id to action history. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-22 09:17:35 +02:00
kaizimmerm
3557a58bd9 Merge branch 'feature_configurable_mgmt_sim_scenario' of https://github.com/bsinno/hawkbit.git into feature_configurable_mgmt_sim_scenario 2016-06-21 18:05:39 +02:00
kaizimmerm
7cb3b2f2ff Added storage of clients correlation ID in action history. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-21 18:05:20 +02:00
Michael Hirsch
bf1ca010c7 throw correct exception if target address violates rfc standard 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-21 16:36:01 +02:00