Commit Graph

1824 Commits

Author SHA1 Message Date
Daniel Kraft
810387df3e Read also rpcport from namecoin.conf.
Read also the rpcport setting from namecoin.conf when it is
available and use that as default when switching the setting
in the UI dialog.
2013-07-17 18:33:26 +02:00
Daniel Kraft
a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
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
56c13366a1 Merge pull request #308 from Atheros1/master
Correct indent on a single line
2013-07-15 16:37:39 -07:00
Jonathan Warren
151ca020df Correct indent on a single line 2013-07-15 19:36:37 -04:00
Jonathan Warren
0ad36d011a Merge pull request #307 from Atheros1/master
Store msgid in sent table
2013-07-15 16:35:13 -07: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
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
Jonathan Warren
68a2069329 Merge pull request #306 from Atheros1/master
Key file permissions
2013-07-15 12:51:27 -07:00
Jonathan Warren
08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
fuzzgun
a7a2de1d24 Fixed freeze on Ubuntu 2013-07-15 18:13:21 +01:00
fuzzgun
3e13468695 Use subprocess.call 2013-07-15 17:58:22 +01: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
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
Jonathan Warren
52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
fuzzgun
1ab664564b Play sounds on connection/disconnection or when messages arrive 2013-07-15 17:01:12 +01:00
Jonathan Warren
5ca0eac7a9 Merge pull request #302 from DivineOmega/fix_missing_logger
Fix missing logger
2013-07-15 08:32:26 -07: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
Nimda
2185b27b1e Merge remote-tracking branch 'upstream/master' 2013-07-14 22:45:26 -04: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
952c4ad5f8 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-07-14 16:36:24 -04:00
Jonathan Warren
143c4bcd20 manual merge 2013-07-14 16:35:16 -04:00
Jonathan Warren
cb2f89a7bf Merge pull request #300 from Atheros1/master
Move debug.log to the config directory
2013-07-14 13:14:30 -07:00
Jonathan Warren
1bf39dbfd0 moved debug.log file to the config directory 2013-07-14 16:12:59 -04:00
fuzzgun
d04b8747c7 Use python2 within /usr/bin/pybitmessage #296 2013-07-14 12:31:58 +01: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
Jonathan Warren
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
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
fuzzgun
d3b76eb610 python2-gevent is optional 2013-07-12 18:09:59 +01:00
fuzzgun
33a41367b3 Duplocated command in Makefile 2013-07-12 14:09:10 +01:00
fuzzgun
28d1bfa645 Some Arch dependencies 2013-07-12 14:03:11 +01:00
fuzzgun
3364433765 Fixing the puppy script 2013-07-12 12:07:55 +01: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
fuzzgun
10b23d0946 Packaging for multiple distros 2013-07-12 10:36:28 +01: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