Jonathan Warren
e82a8aead3
manual merge
2013-07-14 17:03:17 -04:00
Jonathan Warren
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
Jonathan Warren
1bf39dbfd0
moved debug.log file to the config directory
2013-07-14 16:12:59 -04:00
Jonathan Warren
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
Jonathan Warren
fbb9a4ae60
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2013-07-13 20:04:43 -04: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
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
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
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
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
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
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
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
Linker Lin
4a84a30fc6
replace acquire lock by 'with' statement
2013-06-30 01:29:35 +08:00
Carlos Killpack
935fe33a47
Real logging, please incorporate into new and existing code.
2013-06-29 10:27:40 -06:00
linkerlin
80e5adad8c
Made it compatible with gevent 1.0dev version.
2013-06-28 22:26:31 +08:00
miao.lin
284b3a24f7
Put setDaemon inside init.
2013-06-28 18:22:10 +08:00
miao.lin
9fa90ccc3f
Sleep more , save more.
2013-06-28 17:50:43 +08:00
miao.lin
e8eaf65f07
Sleep more , save more.
2013-06-28 17:48:32 +08:00
miao.lin
3eea6d6a88
Removed a blank line.
2013-06-28 17:28:17 +08:00
miao.lin
5df22b4181
Made gevent happy with PyQt.
2013-06-28 16:45:03 +08:00
miao.lin
0aa7efab34
renamed class BGWorker to bgWorker
2013-06-28 15:43:24 +08:00
miao.lin
e47d35769b
renamed class BGWorker to bgWorker
2013-06-28 15:36:34 +08:00
miao.lin
6facca4cb3
Added a class for background working
2013-06-28 15:25:31 +08:00
Gregor Robinson
eba0878172
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-06-27 12:42:18 +00:00
Gregor Robinson
1ed34b0084
Make warning message more specific.
2013-06-27 10:44:49 +00:00
Gregor Robinson
db3120f655
Fix #263 & #262 : insecure keyfile permissions.
...
* Added conditional to keyfile fix code that excludes windows.
* Cleaned up old keyfile permissions fix.
* Added umask (not conditional against Windows, because I don't think that is necessary).
2013-06-27 10:02:52 +00:00
Jonathan Warren
0f8b9f97bd
Increment version number to 0.3.4
2013-06-26 14:22:13 -04:00
Jonathan Warren
9f95df9e8d
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-06-26 13:59:22 -04:00
Jonathan Warren
e9fbbe3dcc
Merge pull request #261 from xj9/xdg
...
Fixed issue #157 : Use $XDG_CONFIG_HOME
2013-06-26 10:54:37 -07:00
Jonathan Warren
1657dfec24
Move code related to settings file upgrade
2013-06-26 13:35:53 -04:00
