9 commits

Author	SHA1	Message	Date
Srdjan Obucina	243a269f36	Fix build errors due to merge conflict	2019-12-12 19:35:27 +01:00
Srdjan Obucina	6efbf6c512	Merge branch 'feature/SONs-base' of https://github.com/peerplays-network/peerplays into feature/SON-203	2019-12-12 18:40:29 +01:00
satyakoneru	1d5878db28	SON193-SON200- SON Heartbeats and maintenance mode changes (#241) ... * SON193-SON200- SON Heartbeats and maintenance mode changes * SON193-SON200- SON Heartbeats and maintenance tests	2019-12-12 18:36:38 +05:30
Srdjan Obucina	a2d71689c1	Fix reflection problem	2019-12-09 20:50:40 +01:00
Srdjan Obucina	0ecffdd4a8	WIP: User sidechain address mappings	2019-12-09 00:25:34 +01:00
obucinac	e3548de34e	SON object, operations, cli_wallet commands and RPC (#160) ... - create_son, update_son, delete_son, list_sons - get_sons, get_son_by_account, lookup_son_accounts, get_son_count - vote_for_son, update_son_votes - claim_registered_son - get_son in cli_wallet - Updating global_property_object - Decrease SON hardfork time for test purposes - CLI Wallet tests imported from develop branch	2019-10-09 22:24:36 +02:00
Prabhjot	80dc2003b9	Removed redundant if from asset_evaluator and fixed db_notify	2019-08-09 13:18:09 -04:00
pbsa	485bb0e7b3	included sstring in 2 files, added missing ops to db_notify.cpp	2019-08-06 15:19:51 -03:00
Prabhjot Singh	aa3128fe89	Merged beatrice into 5050	2019-07-30 11:43:31 -04:00