Commit Graph

67 Commits

Author SHA1 Message Date
amalraj.manigmail.com d7cd5a37a7 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.18-suborgs-docs' into permissioning-suborgs-review
# Conflicts:
#	cmd/geth/main.go
#	controls/bind/permission/permission_impl.go
#	controls/bind/permission/permission_interface.go
#	controls/bind/permission/permission_upgr.go
#	core/types/permissions_cache.go
#	docs/README.md
#	docs/permissions.md
#	eth/backend.go
#	internal/ethapi/api.go
#	permission/api.go
#	permission/bind/implementation.go
#	permission/bind/interface.go
#	permission/bind/permission_impl.go
#	permission/bind/permission_interface.go
#	permission/bind/permission_upgr.go
#	permission/bind/upgradable.go
#	permission/contract/OrgManager.sol
#	permission/contract/PermissionsInterface.sol
#	permission/contract/PermissionsUpgradable.sol
#	permission/contract/abi/OrgManager.abi
#	permission/contract/abi/PermissionsImplementation.abi
#	permission/contract/abi/PermissionsInterface.abi
#	permission/permission.go
2019-07-08 18:57:44 +08:00
amalraj.manigmail.com 6d8f451f45 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.18-suborgs-docs' into permissioning-suborgs-review
# Conflicts:
#	cmd/geth/main.go
#	controls/bind/permission/permission_impl.go
#	controls/bind/permission/permission_interface.go
#	controls/bind/permission/permission_upgr.go
#	core/types/permissions_cache.go
#	docs/README.md
#	docs/permissions.md
#	eth/backend.go
#	internal/ethapi/api.go
#	permission/api.go
#	permission/bind/implementation.go
#	permission/bind/interface.go
#	permission/bind/permission_impl.go
#	permission/bind/permission_interface.go
#	permission/bind/permission_upgr.go
#	permission/bind/upgradable.go
#	permission/contract/OrgManager.sol
#	permission/contract/PermissionsInterface.sol
#	permission/contract/PermissionsUpgradable.sol
#	permission/contract/abi/OrgManager.abi
#	permission/contract/abi/PermissionsImplementation.abi
#	permission/contract/abi/PermissionsInterface.abi
#	permission/permission.go
2019-07-08 18:57:26 +08:00
vsmk98 8c33f25f1b permission: moved startQuorumService from main.go to permission.go 2019-06-07 14:51:21 +08:00
vsmk98 a5a51d1595 permission: Added setMigrationPolicy to implementation to support policy data update to support implementation contract upgrade. Documentation change. 2019-06-03 15:24:31 +08:00
vsmk98 9632606829 permission: moved the contracts addresses to init of PermissionsImplementation.sol 2019-06-03 13:37:23 +08:00
vsmk98 b6f4529629 permission: Code changes as per review comments 2019-05-31 14:25:56 +08:00
vsmk98 96f1e0a59a permission: fix for sporadic - "failed to execute permissions action: Account not authorized for this operation" error 2019-05-21 11:57:10 +08:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
vsmk98 0cd8c89018 permission: code clean up based on review comments 2019-05-17 16:12:53 +08:00
vsmk98 045d936369 permission: Code and documentation clean up 2019-05-15 17:12:11 +08:00
vsmk98 3994997a73 permissions: big fixes and code clean up based on review comments 2019-05-13 14:15:09 +08:00
vsmk98 b704b7c9ea permissions: code clean up 2019-05-10 15:20:02 +08:00
vsmk98 ad2abca93a permissions: code comments update 2019-05-10 15:17:01 +08:00
vsmk98 e76ba8c637 permissions: code change based on review feedback 2019-05-10 10:49:16 +08:00
vsmk98 6b66f7e27d permissions: Code clean up. 2019-05-09 11:07:54 +08:00
amalraj.manigmail.com 6e7f3959e3 permission: update start and initialize service methods
code clean up - remove unused code related to org key
2019-05-08 22:55:03 +08:00
amalraj.manigmail.com 468478be78 permission: refactor dir structure for contract 2019-05-08 18:08:08 +08:00