Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
455 commits 15 branches 0 tags 6.4 MiB
Commit graph

455 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Frias
5543044bd3 Collect time of git commit for display in Keyhotee, add function for pretty-printing times 2014-03-31 16:10:52 -04:00
dnotestein
6c989e7b7a added minutes, hours, and days time functions 2014-03-31 11:01:28 -04:00
dnotestein
10127a854c Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 
Conflicts:
	src/crypto/elliptic.cpp
 2014-03-30 18:32:20 -04:00
dnotestein
f09c91f878 added hash64 function that uses sha256 to replace city_hash in blockchain and message protocol-related hashing 2014-03-30 14:16:33 -04:00
Daniel Larimer
5f9dfa9a42 update http code 2014-03-27 19:53:40 -04:00
Daniel Larimer
3c59eebe92 Update HTTP server api to specify network interface 2014-03-27 01:55:52 -04:00
Daniel Larimer
987568e31b update apis 2014-03-27 01:09:08 -04:00
Daniel Larimer
bdeefb48bf adding std::map<> conversions to/from variant 2014-03-24 11:46:23 -04:00
Daniel Larimer
e2fb6eb5be Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-03-21 01:14:12 -04:00
Daniel Larimer
51a3d1126f fix console 2014-03-21 01:14:01 -04:00
Daniel Larimer
b358b641d4 Merge pull request #19 from pch957/patch1 
filesystem::rename() can handle file from cross device
 2014-03-20 00:00:47 -04:00
Daniel Larimer
b103a52d55 Merge pull request #20 from pch957/patch2 
add depend lib for libcrypt.a: libdl and libz
 2014-03-19 23:59:33 -04:00
alt
9561bb6510 add depend lib for libcrypt.a: libdl and libz 2014-03-20 09:37:59 +08:00
alt
7506790bee filesystem::rename() can handle file from cross device 2014-03-20 09:27:32 +08:00
dnotestein
e4e99f98d9 changes for installer 2014-03-14 17:14:02 -04:00
Eric Frias
0e6e86f273 Make FC's CMakeLists.txt provide a list of required DLLs to projects that use it 2014-03-14 14:11:56 -04:00
Daniel Larimer
d3c2f60fe0 adding extra operators 2014-03-13 20:04:47 -04:00
Daniel Larimer
b83a49298e adding extra to_string 2014-03-11 11:29:29 -04:00
Daniel Larimer
4ed7659b2b Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix 2014-03-10 22:23:19 -04:00
Daniel Larimer
a7b579e4e8 adding api helper 2014-03-10 22:22:31 -04:00
Eric Frias
e04d544016 Remove erroneous assert in fc::thread_d::check_for_timeouts() 
I believe this assert was being triggered when the only task on
a thread did a fc::usleep (it might only have been when the
sleep was of very short duration).
 2014-03-10 17:37:38 -04:00
Daniel Larimer
e3b43be2e7 Merge pull request #18 from HardFork/gitignore 
add to gitignore
 2014-03-09 23:42:09 -04:00
Tzadik Vanderhoof
4c8b63f834 ignores 2014-03-09 22:34:50 -04:00
Daniel Larimer
0fbe912e28 Merge pull request #16 from HackFisher/patch-1 
This should be a typo, fix it.
 2014-03-09 19:16:29 -04:00
HackFisher
8b73226312 This should be a typo, fix it. 
move ">" before #endif
 2014-03-09 16:18:00 +08:00
Eric Frias
f98a0d0623 Switch exception handling in win32 to /EHsc 2014-03-08 18:52:18 -05:00
Eric Frias
fdbaf88e5e Provide a way to intercept Win32 structured exceptions in async tasks 
Something about the stacks created by boost::context prevents global structured exception handlers
from being called.  This allows the user to register a handler which will be called when there
is an unhandled structured exception in async task.
 2014-03-08 18:48:19 -05:00
vogel76
07ba2d6d95 [BW]: [Fix] Include directories shall be specified through target_include_directories not just include_directories call. 2014-03-08 03:20:11 +01:00
vogel76
f5249dc2d6 [BW]: [Ign] Workaround for missing template aliasing feature in VS 2012 to make bts_wallet compiling. 2014-03-04 18:24:15 +01:00
vogel76
163be8a6d0 [BW]: [NIP] Added public_key::to_base58 text conversion to simplify contact display_name generation at bts side. 2014-03-03 11:31:08 +01:00
Daniel Larimer
ecba7c5076 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-02-27 23:35:27 -05:00
Daniel Larimer
4b2d221c05 fix ecc point seralization 2014-02-27 23:35:24 -05:00
dnotestein
503b9033e8 fix infinite loop in windows when trying to read json variant from empty file 2014-02-27 21:56:46 -05:00
Daniel Larimer
5f36e9acac Merge pull request #15 from BrownBear2/phoenix 
added missing files: romix.[hc]pp
 2014-02-27 12:40:08 -05:00
BrownBear
46bfcfe74d added missing files: romix.[hc]pp 2014-02-27 12:37:23 +01:00
dnotestein
160b84487b Disabled armory import code for now to get Bitshares and fc compiling. 2014-02-26 17:24:40 -05:00
dnotestein
71759891f1 Merge pull request #9 from BrownBear2/phoenix 
added romix kdf and cfb for aes
 2014-02-26 15:44:13 -05:00
BrownBear2
49ff83922b added romix kdf and cfb for aes 2014-02-26 12:05:17 +01:00
dnotestein
90c0dea523 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-02-25 09:23:25 -05:00
Daniel Larimer
6bf740c28f Merge pull request #14 from tzadikv/phoenix 
Adding binary constructor for hash.
 2014-02-25 01:20:04 -05:00
Tzadik Vanderhoof
0761d32d01 safer sha256 binary constructor 2014-02-24 02:08:48 -05:00
Tzadik Vanderhoof
57769e4df9 BSX-21 Import Bitcoin Private Key from String 2014-02-24 00:47:00 -05:00
dnotestein
435e6b9926 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-02-22 21:44:38 -05:00
dnotestein
63c6b2a02b Merge pull request #13 from wackou/fix_macos_compile 
Fix compilation on mac os with clang/libc++
 2014-02-22 16:29:22 -05:00
Nicolas Wack
30ee9868e6 Fix compilation on mac os with clang/libc++ 2014-02-22 19:27:53 +01:00
dnotestein
7df77777f1 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-02-21 19:55:39 -05:00
Daniel Larimer
b203bfdab5 Merge pull request #12 from batmaninpink/osx 
fix scrypt-jane OS X compile - again - revert the last changes and disab...
 2014-02-21 16:32:46 -05:00
batmaninpink
cd0f0a5797 fix scrypt-jane OS X compile - again - revert the last changes and disable all assembler or we run in to problems with older LLVM versions 2014-02-21 22:24:04 +01:00
Daniel Larimer
c7baf276a1 scrypt code does not compile with clang 2014-02-21 15:10:34 -05:00
Daniel Larimer
afe9874cba Merge pull request #11 from batmaninpink/osx 
fix scrypt-jane OS X compile
 2014-02-21 15:06:46 -05:00