Commit Graph

12 Commits

Author SHA1 Message Date
Peter Surda
a2cd3cbfc2 Add: debugging for freezing api call 2015-09-28 20:22:54 +02:00
Peter Surda
9d7bec58d1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/proofofwork.py
2015-06-20 09:58:08 +02:00
Peter Surda
b6a91ed4b3 Minor changes in cli, PoW, and a couple of new api calls. 2015-06-20 09:54:15 +02:00
Jonathan Warren
cc712cb8ff finished work on specifyTTL 2015-03-09 02:35:32 -04:00
Jonathan Warren
7a203fe803 Merge pull request #740 from noffle/blacklist_api
Blacklist API
2014-12-25 22:12:42 -05:00
Jonathan Warren
50c392c197 resolve merge conflict 2014-12-25 20:37:04 -05:00
Stephen Whitmore
e93d23d2e0 Adds new API error codes for black-/white-list manipulation.
Refactors loadBlackWhiteList into more generic rerenderBlackWhiteList
2014-11-22 13:56:41 -08:00
Stephen Whitmore
afb21ca307 Adds API commands for blacklist manipulation. 2014-11-22 13:13:35 -08:00
Yuri
34824c044e Moved all keys.dat writing code into writeKeysFile in shared.py 2014-09-14 23:34:33 -07:00
Jonathan Warren
90800af729 very minor improvements to ProtoV3 2014-08-27 19:17:47 -04:00
Jonathan Warren
c306062282 Bitmessage Protocol Version Three 2014-08-27 03:14:32 -04:00
Jonathan Warren
0b81e9b206 rename bitmessageapi.py to api.py 2014-01-12 19:56:30 -05:00