Jonathan Warren
fbb9a4ae60
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2013-07-13 20:04:43 -04:00
Jonathan Warren
640a4c6030
Merge pull request #291 from fiatflux/no_propagate_loggers
...
Don't propagate loggers; add some logging.
2013-07-13 16:42:48 -07:00
akh81
f240f65d53
added translations
2013-07-13 01:19:59 -05:00
David Nichols
922cce6558
Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load.
2013-07-12 13:42:11 -05:00
David Nichols
27c0ac436c
Updating code comments to reflect changes in listening for connections when using SOCKS.
2013-07-12 13:40:06 -05: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
fuzzgun
d3b76eb610
python2-gevent is optional
2013-07-12 18:09:59 +01:00
fuzzgun
33a41367b3
Duplocated command in Makefile
2013-07-12 14:09:10 +01:00
fuzzgun
28d1bfa645
Some Arch dependencies
2013-07-12 14:03:11 +01:00
fuzzgun
3364433765
Fixing the puppy script
2013-07-12 12:07:55 +01:00
Gergö Barany
fc5da5d3ff
Refactor type 2 message decoding, drop any extra lines from subject.
...
This allows other clients to insert headers in extra lines of text between
the Subject and Body fields of the message, as discussed on the 24x7 mailing
list. The PyBitmessage client was never able to meaningfully display
multi-line subjects, so this does not break anything. The extra lines are
thrown away and never stored anywhere, so this also protects against
watermarking attacks.
2013-07-12 12:16:34 +02:00
fuzzgun
10b23d0946
Packaging for multiple distros
2013-07-12 10:36:28 +01:00
Rainulf Pineda
a3cdc28bbf
Fixed crash on sql query.
2013-07-12 05:02:21 -04:00
Rainulf Pineda
997a8ff13a
Sent search.
2013-07-12 04:42:52 -04:00
Rainulf Pineda
45cfead4d0
Inbox search.
2013-07-12 04:24:24 -04:00
akh81
c1496551e6
added translations
2013-07-12 03:12:57 -05:00
Rainulf Pineda
855a9f963f
Generated py for search.
2013-07-12 02:01:33 -04:00
Gregor Robinson
fa53eb370c
Clarify IOError handling with comment.
2013-07-11 23:58:10 +01:00
Rainulf Pineda
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
Gregor Robinson
e8fa5aaefe
Switch an stderr message to logger.
2013-07-10 20:29:07 +01:00
Gregor Robinson
718de832ab
Merge branch 'no_propagate_loggers' into keyfile_perm_fix
...
Conflicts:
src/shared.py
2013-07-10 20:24:23 +01:00
Gregor Robinson
32ba57c108
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-10 20:18:10 +01:00
Gregor Robinson
3179ea30f0
These changes slipped from last commit. Sorry.
2013-07-10 20:15:04 +01:00
Gregor Robinson
2e2db97250
Don't propagate loggers; add some logging.
2013-07-10 20:09:27 +01:00
Gregor Robinson
a579e8f1d3
Logging fixes.
2013-07-10 11:43:18 +03:00
Jonathan Warren
eed8c66512
Merge pull request #290 from dpc/master
...
Tiny building scripts improvements.
2013-07-09 10:08:19 -07:00
Dawid Ciężarkiewicz
e4869514ca
Add make uninstall
.
2013-07-09 12:19:54 +02:00
Dawid Ciężarkiewicz
2b2fa867f0
Exit if dpkg-buildpackage
fails.
2013-07-09 12:19:31 +02:00
Gregor Robinson
1ff1c1b8a5
Spelling.
2013-07-08 23:33:15 +03:00
Gregor Robinson
ebaa1bf346
No paranoid key disable for bad keyfile perms.
2013-07-08 23:21:29 +03:00
Gregor Robinson
f8c955eec0
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-08 22:56:47 +03:00
Jonathan Warren
a3d21dc880
Merge pull request #280 from RemideZ/master
...
macOSX compatibility
2013-07-05 15:29:07 -07:00
Jonathan Warren
12c3aaceb8
Merge pull request #273 from xj9/logging
...
Real logging, please incorporate into new and existing code.
2013-07-05 15:16:07 -07:00
Jonathan Warren
d06806c3d4
Merge pull request #287 from Atheros1/master
...
gevent
2013-07-05 13:59:12 -07:00
Jonathan Warren
21ce1f5a19
manual merge
2013-07-05 16:56:49 -04:00
Jonathan Warren
39f4f85b11
removed apparently unnecessary loop
2013-07-05 16:43:40 -04:00
Jonathan Warren
1f8eee4119
removed apparently unnecessary loop
2013-07-05 16:01:20 -04:00
Jonathan Warren
5f87415395
Merge pull request #281 from pgimeno/cpu100percentfix
...
Better fix for issue #183
2013-07-02 19:29:04 -07:00
RemideZ
68b2350276
Nicer formatting
2013-07-02 20:25:18 +02:00
Pedro Gimeno
55b899f5c1
Better fix for issue #183
...
The former patch was too local; this one integrates better with the structure of the code.
2013-07-02 17:43:54 +02:00
RemideZ
2c8ca6623a
Update openssl.py
2013-07-02 13:53:35 +02:00
RemideZ
8df9dc5731
Update bitmessagemain.py
2013-07-02 13:52:55 +02:00
RemideZ
8bf8e47cd1
Update __init__.py
2013-07-02 13:52:16 +02:00
Jonathan Warren
2012096673
Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master
2013-07-01 15:51:55 -04:00
Jonathan Warren
b4e292e280
Merge pull request #275 from fuzzgun/master
...
Altered Makefile to avoid needing to chase changes
2013-07-01 10:10:57 -07:00
Jonathan Warren
e2f9b01558
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-07-01 13:06:13 -04:00
Jonathan Warren
e8f09c2110
Merge pull request #277 from pgimeno/cpu100percentfix
...
Fix issue #183 (CPU 100% usage)
2013-07-01 10:05:39 -07:00
Pedro Gimeno
95a1afb84b
Fix issue #183 (CPU 100% usage)
...
As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
2013-07-01 07:36:22 +02:00
fuzzgun
b038edf2b2
Repairing debian packaging
2013-06-30 16:16:41 +01:00
fuzzgun
3e079787be
Altered Makefile to avoid needing to chase changes
2013-06-30 11:17:49 +01:00