d905bd8724
Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master
2013-07-14 17:25:36 -04:00
b500a01c33
Merge pull request #295 from grbitmsg/single_line_subject
...
Refactor type 2 message decoding, drop any extra lines from subject.
2013-07-14 13:40:07 -07:00
952c4ad5f8
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-07-14 16:36:24 -04:00
143c4bcd20
manual merge
2013-07-14 16:35:16 -04:00
cb2f89a7bf
Merge pull request #300 from Atheros1/master
...
Move debug.log to the config directory
2013-07-14 13:14:30 -07:00
1bf39dbfd0
moved debug.log file to the config directory
2013-07-14 16:12:59 -04:00
d04b8747c7
Use python2 within /usr/bin/pybitmessage #296
2013-07-14 12:31:58 +01:00
d93d923364
Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move
2013-07-13 20:35:06 -04:00
fbb9a4ae60
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2013-07-13 20:04:43 -04:00
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
922cce6558
Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load.
2013-07-12 13:42:11 -05:00
27c0ac436c
Updating code comments to reflect changes in listening for connections when using SOCKS.
2013-07-12 13:40:06 -05:00
97f0c56aa8
Adding configuration option to listen for connections when operating with a SOCKS proxy.
2013-07-12 13:03:09 -05:00
d3b76eb610
python2-gevent is optional
2013-07-12 18:09:59 +01:00
33a41367b3
Duplocated command in Makefile
2013-07-12 14:09:10 +01:00
28d1bfa645
Some Arch dependencies
2013-07-12 14:03:11 +01:00
3364433765
Fixing the puppy script
2013-07-12 12:07:55 +01:00
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
10b23d0946
Packaging for multiple distros
2013-07-12 10:36:28 +01:00
a3cdc28bbf
Fixed crash on sql query.
2013-07-12 05:02:21 -04:00
997a8ff13a
Sent search.
2013-07-12 04:42:52 -04:00
45cfead4d0
Inbox search.
2013-07-12 04:24:24 -04:00
855a9f963f
Generated py for search.
2013-07-12 02:01:33 -04:00
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
3179ea30f0
These changes slipped from last commit. Sorry.
2013-07-10 20:15:04 +01:00
2e2db97250
Don't propagate loggers; add some logging.
2013-07-10 20:09:27 +01:00
eed8c66512
Merge pull request #290 from dpc/master
...
Tiny building scripts improvements.
2013-07-09 10:08:19 -07:00
e4869514ca
Add `make uninstall`.
2013-07-09 12:19:54 +02:00
2b2fa867f0
Exit if `dpkg-buildpackage` fails.
2013-07-09 12:19:31 +02:00
a3d21dc880
Merge pull request #280 from RemideZ/master
...
macOSX compatibility
2013-07-05 15:29:07 -07:00
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
d06806c3d4
Merge pull request #287 from Atheros1/master
...
gevent
2013-07-05 13:59:12 -07:00
21ce1f5a19
manual merge
2013-07-05 16:56:49 -04:00
39f4f85b11
removed apparently unnecessary loop
2013-07-05 16:43:40 -04:00
1f8eee4119
removed apparently unnecessary loop
2013-07-05 16:01:20 -04:00
5f87415395
Merge pull request #281 from pgimeno/cpu100percentfix
...
Better fix for issue #183
2013-07-02 19:29:04 -07:00
68b2350276
Nicer formatting
2013-07-02 20:25:18 +02:00
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
2c8ca6623a
Update openssl.py
2013-07-02 13:53:35 +02:00
8df9dc5731
Update bitmessagemain.py
2013-07-02 13:52:55 +02:00
8bf8e47cd1
Update __init__.py
2013-07-02 13:52:16 +02:00
2012096673
Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master
2013-07-01 15:51:55 -04:00
b4e292e280
Merge pull request #275 from fuzzgun/master
...
Altered Makefile to avoid needing to chase changes
2013-07-01 10:10:57 -07:00
e2f9b01558
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-07-01 13:06:13 -04:00
e8f09c2110
Merge pull request #277 from pgimeno/cpu100percentfix
...
Fix issue #183 (CPU 100% usage)
2013-07-01 10:05:39 -07:00
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
b038edf2b2
Repairing debian packaging
2013-06-30 16:16:41 +01:00
3e079787be
Altered Makefile to avoid needing to chase changes
2013-06-30 11:17:49 +01:00
4a84a30fc6
replace acquire lock by 'with' statement
2013-06-30 01:29:35 +08:00
935fe33a47
Real logging, please incorporate into new and existing code.
2013-06-29 10:27:40 -06:00
Jonathan Warren
fuzzgun
David Nichols
Gergö Barany
Rainulf Pineda
Gregor Robinson
Dawid Ciężarkiewicz
RemideZ
Pedro Gimeno
Linker Lin
Carlos Killpack