Commit Graph

45 Commits

Author SHA1 Message Date
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
9044e84093 some specifyTTL work completed 2015-03-03 14:04:12 -05:00
Jonathan Warren
95c939a2a0 Fix #748 - Check hash of sig instead of message contents 2015-02-20 21:03:20 -05:00
Jonathan Warren
50c392c197 resolve merge conflict 2014-12-25 20:37:04 -05:00
Jonathan Warren
3ef83c2f95 Leftover change from clearing ProtoV2 code: increment settings version from 7 to 8 2014-12-25 19:23:16 -05:00
Jonathan Warren
e898b40203 Removed obsolete Protocol v2 code 2014-12-25 04:06:57 -05:00
Yuri
34824c044e Moved all keys.dat writing code into writeKeysFile in shared.py 2014-09-14 23:34:33 -07:00
Jonathan Warren
0865e863ec Added ability to limit network transfer rate 2014-09-10 16:47:51 -04:00
Jonathan Warren
c84cdecba4 Normalize the noncetrialsperbyte and payloadlengthextrabytes for each of the user's existing addresses 2014-09-02 19:25:03 -04:00
Jonathan Warren
c306062282 Bitmessage Protocol Version Three 2014-08-27 03:14:32 -04:00
Jonathan Warren
df7116bd72 on close, save objectProcessorQueue to disk 2013-12-02 01:35:34 -05:00
Jonathan Warren
bd2803bebc various changes to 'messages expire' pull request 2013-11-04 02:05:07 -05:00
Jonathan Warren
f4fd5fd5bd Improve verbage in UI 2013-11-02 00:19:54 -04:00
Jonathan Warren
f7ef2b4e05 various changes to Identicon code 2013-11-01 19:25:24 -04:00
Jonathan Warren
753155aa86 Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons 2013-10-30 15:56:22 -04:00
ikarakatsanis
9066dad5e3 AQWA feature: UI setting for Bitmessage to stop trying to send messages after X hours/days/months 2013-10-10 09:10:46 +04:00
Peter
5fb08efe00 merged 2013-10-03 19:39:27 +04:00
ikarakatsanis
c16d9787d2 feature1_v3_AQWA 2013-10-03 18:29:50 +04:00
ikarakatsanis
d487b522cf feature_v1 2013-10-02 04:14:53 +04:00
Jonathan Warren
498928405b Chan fix: initial work completed 2013-09-29 19:24:27 -04:00
ikarakatsanis
e1fc820226 changes in keys.dat, edit hours/days/months is working now, variable time_period inserted 2013-09-28 04:47:16 +04:00
Jonathan Warren
6081863b28 raise default demanded difficulty from 1 to 2 2013-09-22 23:12:21 -04:00
sendiulo
21005fb0a8 - add the settings also for old users 2013-09-21 17:06:54 +02:00
Jonathan Warren
79f6169803 further v4 address work 2013-09-14 21:06:26 -04:00
Jonathan Warren
56168e82b5 most initial work on v4 pubkeys completed 2013-09-13 00:27:34 -04:00
Jonathan Warren
c06bbc14f8 Give user feedback when disk is full 2013-09-04 20:14:25 -04:00
Jonathan Warren
0d5f2680d4 various modifications to previous commit regarding ability to select language 2013-08-27 22:29:39 -04:00
Jonathan Warren
84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger
class_sqlThread.py - changing prints to loggers
2013-08-25 16:07:45 -07:00
Jonathan Warren
b092df7e58 added some more error handling 2013-08-14 19:46:59 -04:00
Jordan Hall
9d3a0a160f Merging with master and resolving conflicts 2013-08-11 00:08:48 +01:00
Jordan Hall
f83b636bc0 Converted print statement in class_sqlThread to logger calls 2013-08-11 00:02:38 +01:00
Jonathan Warren
d51fe37a66 added requested API commands for mobile device 2013-08-06 13:19:26 -04:00
Jonathan Warren
17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
Jonathan Warren
f5e17eeeaa Moved code to add the sockslisten config option to a spot where it will actually work properly 2013-07-24 00:29:30 -04:00
Jonathan Warren
73f3b5d92c Merge pull request #297 from mybluevan/master
Adding configuration to listen for incoming connections when connected via SOCKS proxy
2013-07-15 15:05:15 -07:00
Jonathan Warren
08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
David Nichols
97f0c56aa8 Adding configuration option to listen for connections when operating with a SOCKS proxy. 2013-07-12 13:03:09 -05:00
Linker Lin
4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
Jonathan Warren
1657dfec24 Move code related to settings file upgrade 2013-06-26 13:35:53 -04:00
Jordan Hall
2eb6558cf1 Added a number of missing imports fixing several issues (thank you PyDev) 2013-06-23 20:52:39 +01:00
Jonathan Warren
f1d2b042ea add import sys to class_sqlThread.py 2013-06-23 02:38:21 -04:00
Jonathan Warren
32aaaf2023 Fix bugs in githup pull request #238 2013-06-21 15:44:28 -04:00
Jordan Hall
ebc62b9edc Moving certain classes outside of bitmessagemain.py 2013-06-20 22:23:03 +01:00