Commit Graph

338 Commits

Author SHA1 Message Date
Jonathan Warren 5f10b6b7f2 Merge pull request #309 from akh81/russian-translation
added Russian translation
2013-07-15 22:04:52 -07:00
akh81 d1ea944f0e complete Russian translation 2013-07-15 23:52:08 -05:00
akh81 1b722dca5c all translations complete 2013-07-15 23:12:07 -05:00
akh81 5f8209698f all translations complete 2013-07-15 23:10:36 -05:00
Jonathan Warren 151ca020df Correct indent on a single line 2013-07-15 19:36:37 -04:00
Jonathan Warren c6291f55ef Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-15 19:28:31 -04:00
Jonathan Warren 3427bc5c26 Store msgid in sent table 2013-07-15 19:27:53 -04:00
Jonathan Warren 08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
Jonathan Warren 558dcf8550 Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm 2013-07-15 12:24:08 -04:00
Jonathan Warren 52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
DivineOmega 3107150ace Added fall back print statements in case logger is unavailable 2013-07-15 10:56:13 +01:00
DivineOmega 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
Jonathan Warren d905bd8724 Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master 2013-07-14 17:25:36 -04:00
Jonathan Warren 3a06edbbd8 manual merge, fix minor import issue 2013-07-14 17:10:37 -04:00
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
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
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
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 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