Alfredo Garcia 8c188bd53f merge gpos to develop (#186) ... * issue - 154: Don't allow to vote when vesting balance is 0 * changes to withdraw_vesting feature(for both cdd and GPOS) * Comments update * update to GPOS hardfork ref * fix for get_vesting_balance API call * braces update * Create .gitlab-ci.yml * fixing build errors (#150) * fixing build errors vest type correction * fixing build errors vest type correction * fixes new Dockerfile * vesting_balance_type correction vesting_balance_type changed to normal * gcc5 support to Dockerfile gcc5 support to Dockerfile * Changes to compiple with GCC 7(Ubuntu 18.04) * changes to have separate methods and single withdrawl fee for multiple vest objects * 163-fix, Return only non-zero vesting balances * Revert "Revert "GPOS protocol"" This reverts commit 67616417b7. * add new line needed to gpos hardfork file * comment temporally cli_vote_for_2_witnesses until refactor or delete * fix gpos tests * fix gitlab-ci conflict		2019-10-17 22:09:44 +05:30
..
app	merge gpos to develop (#186)	2019-10-17 22:09:44 +05:30
chain	merge gpos to develop (#186)	2019-10-17 22:09:44 +05:30
db	Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2	2019-09-21 17:17:19 +02:00
egenesis	Merge pull request #714 from pmconrad/json_fix	2019-08-28 15:42:21 +02:00
fc@f13d0632b0	Point to PBSA/peerplays-fc commit f13d063 (#167)	2019-10-04 20:42:37 +05:30
net	Adjust p2p log level (#180)	2019-10-16 20:57:39 +05:30
plugins	Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2	2019-09-18 16:36:42 +02:00
time	added missing libraries/time	2017-07-17 22:16:23 +02:00
utilities	Merge pull request #714 from pmconrad/json_fix	2019-08-28 15:42:21 +02:00
wallet	merge gpos to develop (#186)	2019-10-17 22:09:44 +05:30
CMakeLists.txt	Required changes to upgrade blockchain to ubuntu18.04	2019-05-20 22:32:17 -03:00