5f10b6b7f2
Merge pull request #309 from akh81/russian-translation
...
added Russian translation
2013-07-15 22:04:52 -07:00
d1ea944f0e
complete Russian translation
2013-07-15 23:52:08 -05:00
1b722dca5c
all translations complete
2013-07-15 23:12:07 -05:00
5f8209698f
all translations complete
2013-07-15 23:10:36 -05:00
56c13366a1
Merge pull request #308 from Atheros1/master
...
Correct indent on a single line
2013-07-15 16:37:39 -07:00
151ca020df
Correct indent on a single line
2013-07-15 19:36:37 -04:00
0ad36d011a
Merge pull request #307 from Atheros1/master
...
Store msgid in sent table
2013-07-15 16:35:13 -07:00
c6291f55ef
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-07-15 19:28:31 -04:00
3427bc5c26
Store msgid in sent table
2013-07-15 19:27:53 -04:00
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
68a2069329
Merge pull request #306 from Atheros1/master
...
Key file permissions
2013-07-15 12:51:27 -07:00
08694ecc38
Portable mode moves debug.log
2013-07-15 15:45:03 -04:00
558dcf8550
Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm
2013-07-15 12:24:08 -04:00
823363b236
Merge pull request #304 from Atheros1/master
...
[Minor] Move one line of code so that correct program activity is logged
2013-07-15 09:22:27 -07: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
d905bd8724
Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master
2013-07-14 17:25:36 -04: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
f240f65d53
added translations
2013-07-13 01:19:59 -05: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
c1496551e6
added translations
2013-07-12 03:12:57 -05: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
Jonathan Warren
akh81
DivineOmega
fuzzgun
David Nichols
Gergö Barany
Rainulf Pineda
Gregor Robinson