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

3299 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
yevhen
932b696556 Merging fix of bug/empty-json-parsing-failure 2021-12-07 17:40:29 +00:00
serkixenos
732cae963d Use add_definitions instead of add_compile_definitions, to support older cmake < 3.12 2021-12-02 12:20:03 -04:00
moss9001
77791b2d20 Update rpc_client.cpp 2021-12-02 15:32:15 +02:00
serkixenos
ec0398c83f Merge branch 'feature/all-in-one-build' into 'develop' 
Add cmake flag to determine testnet vs mainnet build

See merge request PBSA/peerplays!40
 2021-12-02 02:06:38 +00:00
serkixenos
727d54feb0 Add cmake flag to determine testnet vs mainnet build 2021-12-02 02:06:38 +00:00
serkixenos
c72c2bb70b Merge branch 'feature/cli-activate-deregistered-son' into 'develop' 
cli wallet command to reactivate deregistered SON

See merge request PBSA/peerplays!37
 2021-12-02 02:04:50 +00:00
serkixenos
7354de75ef cli wallet command to reactivate deregistered SON 2021-12-02 02:04:50 +00:00
serkixenos
92e017e3b0 Merge branch 'bug/35-blockchain_replay' into 'develop' 
35 bug fix: when blockchain replay is attempted blocks file increases in size

See merge request PBSA/peerplays!34
 2021-12-01 21:57:46 +00:00
Pavel Baykov
3612e1ec23 35 bug fix: when blockchain replay is attempted blocks file increases in size 2021-12-01 21:57:46 +00:00
serkixenos
d5e02551e2 Merge branch 'hotfix/fix-sidechain-address-generation' into 'develop' 
Fix sidechain address generation

See merge request PBSA/peerplays!39
 2021-12-01 15:09:57 +00:00
serkixenos
7bc7f17b3e Fix sidechain address generation 2021-12-01 15:09:57 +00:00
Bobinson K B
b875f0b841 Merge branch 'merge-beatrice-to-master-2021-11' into 'master' 
Merge Beatrice to Master 2021-11

See merge request PBSA/peerplays!33
 2021-12-01 07:54:19 +00:00
serkixenos
9955b390ee Merge Beatrice to Master 2021-11 2021-12-01 07:54:19 +00:00
serkixenos
536e07d726 Merge branch 'hotfix/fix-memo-field-encryption' into 'develop' 
Fix memo field encryption

See merge request PBSA/peerplays!36
 2021-11-30 22:44:56 +00:00
serkixenos
433c75769f Fix memo field encryption 2021-11-30 22:44:55 +00:00
serkixenos
7b2161e87a Merge branch 'issue/son-for-hive-rpc-connection' into 'develop' 
Fix RPC client issues with talking to different nodes

See merge request PBSA/peerplays!31
 2021-11-30 19:14:37 +00:00
serkixenos
7f67397137 Fix RPC client issues with talking to different nodes 2021-11-30 19:14:37 +00:00
serkixenos
8fbe85babb Merge branch 'hotfix/fix-plugin-cli-option' into 'develop' 
Fix plugins cli parameter ambiguity

See merge request PBSA/peerplays!35
 2021-11-29 19:09:00 +00:00
serkixenos
f0bacb3cc1 Fix plugins cli parameter ambiguity 2021-11-29 19:08:59 +00:00
serkixenos
685e9d500c Merge branch 'develop' into beatrice 2021-11-25 20:09:15 -04:00
serkixenos
f279065c79 Handle HARDFORK_SON_FOR_HIVE_TIME properly 2021-11-25 20:08:45 -04:00
serkixenos
873310e16d Merge branch 'develop' into 'beatrice' 
Merge Develop to Beatrice 2021-11

See merge request PBSA/peerplays!32
 2021-11-22 19:36:16 +00:00
serkixenos
bf0cdbdc6e Merge branch 'feature/son-for-hive' into 'develop' 
SON for Hive

See merge request PBSA/peerplays!13
 2021-11-18 17:32:30 +00:00
serkixenos
ceffe4cf3c SON for Hive 2021-11-18 17:32:30 +00:00
serkixenos
43c29ce1bf Merge branch 'beatrice' into develop 2021-11-17 23:15:29 -04:00
serkixenos
4eaef1c171 Merge branch 'master' into beatrice 2021-11-17 19:27:51 -04:00
ss
8e5dfb0e72 Merge branch 'beatrice' into develop 2021-09-11 01:50:55 +02:00
ss
01f860e15b Merge branch 'master' into beatrice 2021-09-11 01:49:05 +02:00
Bobinson K B
2778a99842 Merge branch 'hotfix/son-cli-test-fix' into 'master' 
Fix failing son cli test

See merge request PBSA/peerplays!26
 2021-07-27 12:47:05 +00:00
sierra19XX
d75177b7a1 fix cli test 2021-07-27 09:38:51 +00:00
Bobinson K B
6035d29428 Merge branch 'feature/rel-mainnet-jul21' into 'master' 
Merge Beatrice changes to Main net

See merge request PBSA/peerplays!25
 2021-07-26 20:16:25 +00:00
sierra19XX
ba69da5d5c Merge Beatrice changes to Main net 2021-07-26 20:16:24 +00:00
Bobinson K B
183906370b Merge branch 'feature/reserve-tokens' into 'develop' 
Reserve popular tokens

See merge request PBSA/peerplays!24
 2021-06-29 11:24:08 +00:00
sierra19XX
8b84459e8c Reserve popular tokens 2021-06-29 11:24:07 +00:00
Bobinson K B
5dc753054b Merge branch 'feature/beatrice-changes-to-develop' into 'develop' 
merge beatrice release delta changes into develop

See merge request PBSA/peerplays!23
 2021-06-18 09:09:02 +00:00