Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
3034 commits 435 branches 47 tags 121 MiB
Commit graph

3034 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vlad Dobromyslov
87e214ff22 Merge branch 'feature/260-voting-info' into feature/270-funtions-unified-form 
Conflicts are fixed in:
  libraries/app/database_api.cpp
  libraries/app/include/graphene/app/database_api.hpp
 2022-02-08 11:10:06 +03:00
Vlad Dobromyslov
027464c36f Merge branch 'develop' into feature/260-voting-info 2022-02-08 11:05:28 +03:00
Vlad Dobromyslov
504680f727 #260 votes_info all members as optional 2022-02-08 11:03:36 +03:00
Vlad Dobromyslov
558e3c0045 #260 voters_info all members as optional 2022-02-08 10:19:49 +03:00
Vlad Dobromyslov
9c7c3d2e14 #260 fix get_workers_by_account() 2022-02-08 09:38:17 +03:00
Vlad Dobromyslov
d74b9eeebf #270 get_worker_count(), lookup_worker_accounts() and list_workers() functions 2022-02-08 08:47:10 +03:00
Vlad Dobromyslov
1eafca86a4 #270 api_limit_lookup_son_accounts 2022-02-07 12:34:18 +03:00
Vlad Dobromyslov
b3ee4f5cd7 #270 get_committee_member_count() function 2022-02-07 11:53:03 +03:00
Vlad Dobromyslov
694ad96429 Merge branch 'feature/260-voting-info' into feature/270-funtions-unified-form 2022-02-07 11:46:03 +03:00
Vlad Dobromyslov
6bcea17f28 #260 Add unit test for functions: get_votes() and get_voters() 2022-02-07 09:30:37 +03:00
Vlad Dobromyslov
cd737b57fe #260 Add get_voters function 2022-02-04 14:28:43 +03:00
Vlad Dobromyslov
eb43bc3635 #260 get_son_by_account_id instead of get_son_by_account in wallet_api 2022-02-04 14:27:43 +03:00
Vlad Dobromyslov
0f3ea3d637 #260 get_son_by_account and get_son_by_account_id functions 2022-02-04 14:25:13 +03:00
Vlad Dobromyslov
2d237469a0 #260 Add get_workers function 2022-02-04 14:23:06 +03:00
Vlad Dobromyslov
889265406a #260 Add votes function to database_api and wallet_api 2022-02-04 09:15:34 +03:00
serkixenos
494482eba5 Update README.md 2022-02-03 21:18:41 +00:00
serkixenos
18775061ad Merge branch 'feature/switch-to-ubuntu-20-04' into 'develop' 
Update README for Ubuntu 20.04

See merge request PBSA/peerplays!58
 2022-02-02 13:34:44 +00:00
serkixenos
3c19ea74dd Merge branch 'bug/replace-vulnerable-xml' into 'develop' 
Replace vulnerable XML library

See merge request PBSA/peerplays!57
 2022-02-02 13:34:26 +00:00
serkixenos
eb77c9dfb3 Update README for Ubuntu 20.04 2022-02-01 13:20:17 -04:00
serkixenos
7a9c90a218 Replace vulnerable XML library 2022-02-01 12:21:32 -04:00
serkixenos
66699f1e15 Merge branch 'bug/245-exception-in-witness' into 'develop' 
bug #245 exception seen in witness logs

See merge request PBSA/peerplays!56
 2022-01-31 14:14:25 +00:00
Vlad Dobromyslov
78fbf7c3cd bug #245 exception seen in witness logs 2022-01-31 14:14:24 +00:00
serkixenos
5247f76fc2 Merge branch '237-es7-fix' into 'develop' 
Resolve "port ES changes from Bitshares"

See merge request PBSA/peerplays!53
 2022-01-31 05:25:56 +00:00
Vlad Dobromyslov
39fcacd397 Resolve "port ES changes from Bitshares" 2022-01-31 05:25:56 +00:00
serkixenos
10799a2148 Merge branch 'bug/267-fix-chain_test' into 'develop' 
bug #267 Fix error in chain_test in gitlab autobuild

See merge request PBSA/peerplays!55
 2022-01-28 15:05:49 +00:00
Vlad Dobromyslov
8c3a424bb6 bug #267 Fix error in chain_test in gitlab autobuild 2022-01-28 15:05:49 +00:00
serkixenos
6f6811eec4 Merge branch 'bug/fix-list-active-sons' into 'develop' 
Fix list_active_sons output

See merge request PBSA/peerplays!54
 2022-01-26 18:30:21 +00:00
serkixenos
0bcb0487a7 Fix list_active_son command output on deregistered SONs 2022-01-21 12:17:13 -04:00
serkixenos
b5a9a0101a Merge branch 'bug/cli-wallet-memo-display' into 'develop' 
Fix cli wallet memo displaying

See merge request PBSA/peerplays!52
 2022-01-17 18:25:33 +00:00
serkixenos
5e85079281 Fix cli wallet memo displaying 2021-12-27 00:28:29 -04:00
serkixenos
bfc778068c Merge branch 'beatrice' into develop 2021-12-16 23:15:21 -04:00
serkixenos
f9a40c647e Increase replay's writing to database threshold 2021-12-16 22:27:34 -04:00
serkixenos
e828e7813c Merge branch 'master' into beatrice 2021-12-16 22:08:46 -04:00
serkixenos
0dca13ea7e Revert change to a son_update_operation 2021-12-16 21:59:05 -04:00
serkixenos
b619815077 Revert change to a son_update_operation 2021-12-16 21:34:57 -04:00
Bobinson K B
78730a4564 Merge branch 'beatrice' into 'master' 
Merge beatrice to master 2021-12

See merge request PBSA/peerplays!46
 2021-12-15 16:36:40 +00:00
serkixenos
c888274846 Merge beatrice to master 2021-12 2021-12-15 16:36:40 +00:00
serkixenos
de2a89ebce Set SON for Hive Mainnet hardfork date to 2021-12-21T00:00:00 2021-12-15 09:27:30 -04:00
serkixenos
f69fb7adae Merge branch '230-docker-image-from-ci-should-be-pushed-to-gitlab-registry' into 'develop' 
Update .gitlab-ci.yml to push images to the gitlab registry instead of docker.io

See merge request PBSA/peerplays!48
 2021-12-15 03:51:51 +00:00
Sivakumar Yavvari
666dc76ee4 Update .gitlab-ci.yml to push images to the gitlab registry instead of docker.io 2021-12-14 18:22:12 +00:00
serkixenos
f81b6460d1 Merge branch 'bug/94-docker-build' into 'develop' 
Fix Docker build

See merge request PBSA/peerplays!44
 2021-12-14 06:56:30 +00:00
serkixenos
861e9389ac Fix Docker build 2021-12-14 06:56:30 +00:00
serkixenos
2ba8a7f3a5 Merge branch 'master' into beatrice 2021-12-13 09:49:07 -04:00
Bobinson K B
d8cecab20f Merge branch 'revert-b875f0b8' into 'master' 
Revert "Merge branch 'merge-beatrice-to-master-2021-11' into 'master'"

See merge request PBSA/peerplays!38
 2021-12-10 06:18:51 +00:00
Bobinson K B
dc04759686 Revert "Merge branch 'merge-beatrice-to-master-2021-11' into 'master'" 2021-12-10 06:18:51 +00:00
serkixenos
696f99e6c9 Merge branch 'bug_fix_warnings' into 'develop' 
Remove build warnings

See merge request PBSA/peerplays!43
 2021-12-08 17:07:42 +00:00
serkixenos
4067291094 Remove build warnings 2021-12-08 17:07:41 +00:00
serkixenos
9ebc1ee462 Merge branch 'develop' of https://gitlab.com/PBSA/peerplays into develop 2021-12-07 13:42:46 -04:00
serkixenos
6de45cebb8 Add more mainnet seed nodes 2021-12-07 13:42:24 -04:00
serkixenos
a9bb6cb1dc Merge branch 'bug/empty-json-parsing-failure' into 'develop' 
Merging fix of bug/empty-json-parsing-failure

See merge request PBSA/peerplays!42
 2021-12-07 17:40:29 +00:00