Commit graph

1349 commits

Author SHA1 Message Date
pbattu123
0358ca257e
Merge pull request #16 from peerplays-network/beatrice
Update fc to sync with recent changes on beatrice
2020-03-19 15:00:02 -03:00
pbattu123
9fa98d9a93
Merge pull request #15 from peerplays-network/latest-fc
Merge fc changes from develop(latest-fc) to beatrice
2020-03-09 10:44:59 -03:00
pbattu123
a76b9ff81c include fc build optimization changes 2020-02-20 12:19:22 -04:00
pbattu123
89cbe19f99
Merge pull request #14 from peerplays-network/beatrice
Sync master with Beatrice for latest updates
2020-01-17 17:24:19 -04:00
pbattu123
1cae4d3481 Revert "Merge pull request #13 from gladcow/feature/GRPH-92"
This reverts commit c30f3b7d32, reversing
changes made to 31e289c53d.
2020-01-06 17:00:41 -04:00
pbattu123
c30f3b7d32
Merge pull request #13 from gladcow/feature/GRPH-92
Build optimization fc changes: GRPH-92
2020-01-06 12:35:31 -04:00
pbattu123
a8ffe6ed3d
Merge branch 'latest-fc' into feature/GRPH-92 2020-01-03 09:33:16 -04:00
pbattu123
31e289c53d
Merge pull request #9 from peerplays-network/feature/GRPH-46
GRPH-46-AddQuitCommandToCliWallet - Add Quit command to CLI Wallet
2019-12-06 12:34:33 -04:00
pbattu123
bca392213c
Merge pull request #8 from peerplays-network/feature/GRPH-147
Fix memory leak. Not all tasks are deleted in thread_d dtor
2019-11-21 11:53:43 -04:00
satyakoneru
4beb698268 GRPH-46-AddQuitCommandToCliWallet - Add Quit command to CLI Wallet 2019-11-12 13:46:20 +03:00
Sandip Patel
d16ee316c9 Fix memory leak. Not all tasks are deleted in thread_d dtor 2019-11-12 12:08:29 +05:30
Bobinson K B
1f76279f63
Merge pull request #7 from satyakoneru/latest-fc
GRPH134-Witness High CPU Issue, websocket changes
2019-11-06 20:14:16 +05:30
satyakoneru
2f79730323 GRPH134-Witness High CPU Issue, websocket changes 2019-11-06 11:18:04 +00:00
pbattu123
6096e94e1b
Merge pull request #10 from peerplays-network/feature/SON-137
[SON-137] Fixed fc tests
2019-10-09 09:33:08 -03:00
Sandip Patel
ea4aebf760 Fixed fc tests 2019-10-08 12:13:42 +05:30
pbattu123
f13d0632b0
Merge pull request #4 from Noughmad/GRPH-50-network_broadcast_api-fix
[GRPH-50] network broadcast api fix
2019-10-04 09:24:17 -03:00
pbattu123
209bca8d84
Merge pull request #9 from peerplays-network/feature/GRPH-2
[GRPH-2] Fixed log appending issue.
2019-10-03 11:12:52 -03:00
Sandip Patel
9da11c44ed Fixed log appending issue. 2019-09-20 19:04:24 +05:30
gladcow
2343ab74f3 fix compilation errors 2019-09-19 18:21:50 +03:00
Miha Čančula
243690c67d Small compile fix 2019-09-18 17:19:47 +02:00
Miha Čančula
50932bb5ff Merge branch 'master' into GRPH-50-network_broadcast_api-fix 2019-09-18 15:17:58 +02:00
Peter Conrad
1893cb336c Separate exception declaration and implementation 2019-09-13 14:41:11 +03:00
Peter Conrad
a94d110b5d Get rid of some inlines 2019-09-13 14:34:17 +03:00
Peter Conrad
23761bade5 Dont inline generic pack/unpack to enable externalized serialization 2019-09-13 14:29:24 +03:00
Bobinson K B
443f858d9b
Merge pull request #6 from satyakoneru/GRPH-4
CLI Wallet Crash Fix
2019-09-09 10:58:53 -04:00
satyakoneru
3738830d76 GRPH-4 CLI Wallet Crash Fix 2019-09-09 14:30:25 +00:00
pbattu123
961452f06f
Merge pull request #3 from PBSA/master
Ubuntu 18.04 Upgrade
2019-09-03 13:20:49 -03:00
Roshan Syed
1d60bbb65b
Merge pull request #5 from PBSA/feature/ubuntu18.04-upgrade
Feature/ubuntu18.04 upgrade
2019-09-03 13:00:47 -03:00
Miha Čančula
1f3735e362 Fixes to adapt to changes in variant API 2019-08-20 11:25:38 +02:00
Abit
33215ffb6e Merge pull request #21 from pmconrad/variant_fix
Variant fix
2019-08-20 11:25:15 +02:00
Peter Conrad
10a857ee78 Merge pull request #20 from abitmore/fix-serialization
Fix pack/unpack serialization
2019-08-20 10:58:22 +02:00
Abit
838da0d8dd Merge pull request #15 from pmconrad/json_parsing_fix
JSON parsing fix from steem PR 2178
2019-08-20 10:54:30 +02:00
pbattu123
94b046dce6 commit cmake for cmakehelpers 2019-05-22 16:33:40 +00:00
pbattu
6c9e857bd2 maintaing PBSA own websocketpp(forked from zaphoyd 2019-05-21 19:19:03 -03:00
pbattu
997d211fb1 removed websocket submodule 2019-05-21 19:06:39 -03:00
pbattu
00efb88ac7 fc changes to support ubuntu-18.04 upgrade 2019-05-21 18:42:14 -03:00
Andrew Moore
c8c05254b1 Merged in betting-merge (pull request #1)
Betting merge
2018-08-27 13:59:03 +00:00
Eric Frias
69a1ceabce Add a fc_[diwe]dump() function, analogous to fc_[diew]log() 2018-05-09 15:39:57 -04:00
Eric Frias
b1bba0a5d7 add missing implementation for logger::remove_appender() 2018-04-29 18:58:22 -04:00
Eric Frias
8df97c6b35 Merge remote-tracking branch 'origin/betting' into betting-merge 2017-08-24 17:38:23 -04:00
Roman Olearski
ff099209b6 added ntp hash_ctr_rng 2017-07-13 16:18:29 +02:00
Eric Frias
4d8ac59b0b Merge commit 'cb62798' 2017-06-21 16:43:31 -04:00
Eric Frias
7c88a95df1 Merge commit 'b94a338e56475943eb9bcc79be60ed6afd586796' 2017-06-21 16:19:49 -04:00
Eric Frias
8eb2ccc180 Merge commit '1f41494' 2017-06-21 09:11:02 -04:00
Eric Frias
772c2b2822 Merge commit 'e323862' 2017-06-20 19:06:22 -04:00
Eric Frias
7a44b21acf Merge commit '31adee4' 2017-06-20 18:18:35 -04:00
Eric Frias
2c8cdf84b7 Merge commit '622ff58' 2017-06-20 17:27:58 -04:00
Vikram Rajkumar
cb627980a5 Remove unused CyoEncode and Base32
5c466150ec
2017-06-04 18:13:13 -05:00
Vikram Rajkumar
a30647d32e Revert "Add OpenSSL 1.1.0 support"
This reverts commit fee06a4c75.

Max compatible Boost version is not compatible with OpenSSL 1.1.0
2017-06-04 17:44:25 -05:00
Vikram Rajkumar
b94a338e56 Add missing include
4643586411
2017-06-01 16:49:10 -05:00