Commit Graph

8 Commits

Author SHA1 Message Date
vsmk98 b966118614 permissions: added blacklisted account recovery and approval. 2019-08-02 10:28:20 +08:00
vsmk98 56c2717eb1 permissions: added validations for node recovery initiation and approval activties. 2019-08-01 16:19:26 +08:00
vsmk98 755b586428 permissions: added function to approve recovery of blacklisted node. changes to deleted record from disallowed-nodes.json once recovery is complete 2019-08-01 15:19:40 +08:00
vsmk98 b74fc4d0c2 permissions: added functions for blacklisted node recovery. 2019-08-01 11:10:50 +08:00
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
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