558dcf8550
Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm
2013-07-15 12:24:08 -04:00
52caec5e2b
Move one line of code so that correct program activity is logged
2013-07-15 12:19:53 -04:00
5ca0eac7a9
Merge pull request #302 from DivineOmega/fix_missing_logger
...
Fix missing logger
2013-07-15 08:32:26 -07:00
3107150ace
Added fall back print statements in case logger is unavailable
2013-07-15 10:56:13 +01:00
d900b9de70
Added check for logger global before attempting to log in places where logging may occur before the logger is ready
2013-07-15 10:49:01 +01:00
3a06edbbd8
manual merge, fix minor import issue
2013-07-14 17:10:37 -04:00
e82a8aead3
manual merge
2013-07-14 17:03:17 -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
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
fa53eb370c
Clarify IOError handling with comment.
2013-07-11 23:58:10 +01:00
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
e8fa5aaefe
Switch an stderr message to logger.
2013-07-10 20:29:07 +01:00
718de832ab
Merge branch 'no_propagate_loggers' into keyfile_perm_fix
...
Conflicts:
src/shared.py
2013-07-10 20:24:23 +01:00
32ba57c108
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-10 20:18:10 +01: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
a579e8f1d3
Logging fixes.
2013-07-10 11:43:18 +03: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
1ff1c1b8a5
Spelling.
2013-07-08 23:33:15 +03:00
ebaa1bf346
No paranoid key disable for bad keyfile perms.
2013-07-08 23:21:29 +03:00
f8c955eec0
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-08 22:56:47 +03: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
Jonathan Warren
DivineOmega
fuzzgun
Gergö Barany
Rainulf Pineda
Gregor Robinson
Dawid Ciężarkiewicz
RemideZ
Pedro Gimeno