Commit graph

2054 commits

Author SHA1 Message Date
Abit
3970ca178b
Merge pull request #185 from bitshares/for-core-4.0.x
Merge 4.0.x changes to master
2020-02-21 12:14:35 +01:00
pbattu123
a76b9ff81c include fc build optimization changes 2020-02-20 12:19:22 -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
Peter Conrad
463380d64a
Merge pull request #184 from pmconrad/2078_file_appender
Fixed busy-wait in delete_files
2019-12-11 07:38:39 +01:00
Peter Conrad
3b7e67a3dc Fixed busy-wait in delete_files 2019-12-10 15:41:08 +01: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
Peter Conrad
c851de8caa
Merge pull request #180 from pmconrad/2054_github_autobuild
Add GitHub autobuild
2019-11-30 09:03:55 +01:00
Peter Conrad
6e5fe1f550 Fixed badge 2019-11-29 17:45:19 +01:00
Peter Conrad
1d8b63bdb1
Merge pull request #182 from bitshares/for-core-4.0.x
bring macos build fix to master
2019-11-27 08:05:49 +01:00
Alfredo Garcia
8474e84997
Merge pull request #181 from pmconrad/2070_osx_fix
Fix for OSX build
2019-11-26 10:21:25 -03:00
Peter Conrad
56d9e4d968 Fix for OSX build 2019-11-26 08:26:16 +01:00
Peter Conrad
7981ab08f5 Added badge to README 2019-11-25 15:03:46 +01: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
Peter Conrad
005aa69c0a Attempt to fix tests 2019-11-18 17:19:19 +01:00
Peter Conrad
f7f64ee1fd Add ccache 2019-11-18 17:19:19 +01:00
Peter Conrad
540a99670b Build and run in parallel 2019-11-18 17:16:59 +01:00
Peter Conrad
453345cedf Install boost 2019-11-18 17:16:22 +01:00
Peter Conrad
0e0bc44651 Added initial workflow 2019-11-18 17:16:22 +01: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
Abit
2568867f2f
Merge pull request #178 from bitshares/abitmore-patch-1
Fix potential out-of-bounds access
2019-11-08 16:23:38 +01:00
Abit
1d028b3c15
Fix potential out-of-bounds access
Thanks to Beosin(https://github.com/Lianantech)
2019-11-08 12:13:36 +01:00
Peter Conrad
ad3c881aa2
Merge pull request #13 from bitshares/oxarbitrage-patch-2
add license mit
2019-11-07 17:44:01 +01:00
Peter Conrad
61f16df040 Replaced "regime" 2019-11-07 13:18:49 +01:00
Peter Conrad
ca43b6c6df License clarification 2019-11-06 18:39:03 +01:00
Peter Conrad
0633515d7b Fixed stacktrace license 2019-11-06 18:39:03 +01:00
Peter Conrad
8c9b8a95f5 Updated license file 2019-11-06 18:39:03 +01:00
abitmore
9c3428096a Update copyright notice 2019-11-06 18:39:03 +01:00
Peter Conrad
35b3c0336c Document licensing and history 2019-11-06 18:39:03 +01:00
oxarbitrage
2ae775bdb3 add license mit 2019-11-06 18:39:03 +01:00
Peter Conrad
e5ab69acff
Merge pull request #176 from bitshares/bloom_update
Updated bloom_filter.hpp…
2019-11-06 18:38:14 +01:00
Peter Conrad
41aaa6cb1f
Merge pull request #177 from bitshares/cmake_simplification
Get rid of most extra cmake modules
2019-11-06 15:50:18 +01:00
Peter Conrad
cdbe881996 Removed unused reflection 2019-11-06 15:49:16 +01:00
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
Nathan Hourt
e48941b87e
Merge pull request #175 from bitshares/nathanhourt-fix-warnings
Fix warning in zeroed_array.hpp
2019-11-05 11:06:47 -06:00
Peter Conrad
7e07bc4514 Get rid of most extra cmake modules 2019-11-04 08:21:57 +01:00
Peter Conrad
1d59bb3d47 Updated bloom_filter.hpp from c89c2912c4/bloom_filter.hpp 2019-11-04 08:18:34 +01:00
Nathan Hourt
6e22341d9f
Fix warning in zeroed_array.hpp
Only one template declaration is needed here, I think. Clang gives many, many warnings over it.
2019-11-01 15:14:46 -05: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
Peter Conrad
dd257e5c0b
Merge pull request #171 from pmconrad/obsolete_boost
Removed checks for obsolete boost version numbers
2019-09-25 07:33:19 +02:00
Peter Conrad
4bdab0bb0a Removed checks for obsolete boost version numbers 2019-09-24 17:24:38 +02:00
Abit
2f776301cd
Merge pull request #169 from bitshares/for-core-3-3
Merge 3.3.x branch to master branch
2019-09-23 17:02:18 +02:00
Peter Conrad
9593e5d3bb
Merge pull request #170 from pmconrad/node_crashes
Make for-core-3-3 branch mergable with master
2019-09-23 07:59:51 +02:00
Peter Conrad
ec77b4943c Added std::tuple_size for master compatibility 2019-09-22 10:03:29 +02:00