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
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
32ba57c108
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-10 20:18:10 +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
Daniel Kraft
d95fc5afe0
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
2013-07-09 21:49:04 +02:00
Jonathan Warren
eed8c66512
Merge pull request #290 from dpc/master
...
Tiny building scripts improvements.
2013-07-09 10:08:19 -07:00
Dawid Ciężarkiewicz
e4869514ca
Add make uninstall.
2013-07-09 12:19:54 +02:00
Dawid Ciężarkiewicz
2b2fa867f0
Exit if dpkg-buildpackage fails.
2013-07-09 12:19:31 +02: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
Daniel Kraft
92e2970767
Support NMControl.
...
Optionally support querying nmcontrol instead of namecoind,
including UI for selecting the preference.
2013-07-07 20:04:57 +02:00
Daniel Kraft
06bdc030bd
Report success in status bar.
...
Report success when fetching a BM address from
namecoin in the status bar.
2013-07-07 18:43:09 +02:00
Daniel Kraft
213d92b88a
Add UI to test namecoin connection.
...
Add a test button to namecoin UI settings, which tries
out the connection and reports its result back. Also use
namecoin.conf as config file to load default RPC user/pass
combination from.
2013-07-07 18:41:13 +02:00
Daniel Kraft
68fbc4b344
UI for namecoin connection settings.
...
Add a pane to the settings dialog UI which allows to edit
the connection settings for namecoin.
2013-07-07 17:34:43 +02:00
Daniel Kraft
7c89bacca5
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
2013-07-07 16:59:58 +02: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
d06806c3d4
Merge pull request #287 from Atheros1/master
...
gevent
2013-07-05 13:59:12 -07:00
