Commit Graph

  • 3a06edbbd8 manual merge, fix minor import issue Jonathan Warren 2013-07-14 17:10:37 -0400
  • eaa0b67915
    manual merge Jonathan Warren 2013-07-14 17:03:17 -0400
  • e82a8aead3 manual merge Jonathan Warren 2013-07-14 17:03:17 -0400
  • bb69350a9e
    Merge pull request #295 from grbitmsg/single_line_subject Jonathan Warren 2013-07-14 13:40:07 -0700
  • b500a01c33 Merge pull request #295 from grbitmsg/single_line_subject Jonathan Warren 2013-07-14 13:40:07 -0700
  • fce8af0c1f Merge fc5da5d3ff into 952c4ad5f8 grbitmsg 2013-07-14 13:38:20 -0700
  • 3d22a591aa
    Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-07-14 16:36:24 -0400
  • 952c4ad5f8 Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-07-14 16:36:24 -0400
  • 856543df05
    manual merge Jonathan Warren 2013-07-14 16:35:16 -0400
  • 143c4bcd20 manual merge Jonathan Warren 2013-07-14 16:35:16 -0400
  • 4f0bd789b2
    Merge pull request #300 from Atheros1/master Jonathan Warren 2013-07-14 13:14:30 -0700
  • cb2f89a7bf Merge pull request #300 from Atheros1/master Jonathan Warren 2013-07-14 13:14:30 -0700
  • e96cfbe383 Merge 1bf39dbfd0 into d93d923364 Jonathan Warren 2013-07-14 13:14:22 -0700
  • 0cffb7b3ba
    moved debug.log file to the config directory Jonathan Warren 2013-07-14 16:12:59 -0400
  • 1bf39dbfd0 moved debug.log file to the config directory Jonathan Warren 2013-07-14 16:12:59 -0400
  • 7b0647ac4a
    Use python2 within /usr/bin/pybitmessage #296 fuzzgun 2013-07-14 12:31:58 +0100
  • d04b8747c7 Use python2 within /usr/bin/pybitmessage #296 fuzzgun 2013-07-14 12:31:58 +0100
  • 1ebfba5168 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-14 13:31:51 +0200
  • bb6f81fd80 read attachment bartekn80 2013-07-14 13:26:19 +0200
  • 60610fe234
    Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move Jonathan Warren 2013-07-13 20:35:06 -0400
  • d93d923364 Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move Jonathan Warren 2013-07-13 20:35:06 -0400
  • 4f4af14303
    Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master Jonathan Warren 2013-07-13 20:04:43 -0400
  • fbb9a4ae60 Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master Jonathan Warren 2013-07-13 20:04:43 -0400
  • d596432865 Merge a3cdc28bbf into 640a4c6030 Rainulf Pineda 2013-07-13 16:43:17 -0700
  • baafac1fab
    Merge pull request #291 from fiatflux/no_propagate_loggers Jonathan Warren 2013-07-13 16:42:48 -0700
  • 640a4c6030 Merge pull request #291 from fiatflux/no_propagate_loggers Jonathan Warren 2013-07-13 16:42:48 -0700
  • 2b36b5944e Merge a1c2651467 into eed8c66512 grbitmsg 2013-07-13 16:11:48 -0700
  • 68d01b457a male poprawki odnosnie wysylania zalacznika anita 2013-07-13 14:43:06 +0200
  • 4d474a4b29
    added translations akh81 2013-07-13 01:19:59 -0500
  • f240f65d53 added translations akh81 2013-07-13 01:19:59 -0500
  • 29727a7fe4 modified: __init__.py modified: bitmessageui.py modified: bitmessageui.ui anita 2013-07-12 23:26:47 +0200
  • 8311965124
    Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load. David Nichols 2013-07-12 13:42:11 -0500
  • 922cce6558 Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load. David Nichols 2013-07-12 13:42:11 -0500
  • 794bf3f62a
    Updating code comments to reflect changes in listening for connections when using SOCKS. David Nichols 2013-07-12 13:40:06 -0500
  • 27c0ac436c Updating code comments to reflect changes in listening for connections when using SOCKS. David Nichols 2013-07-12 13:40:06 -0500
  • 3162d49164
    Adding configuration option to listen for connections when operating with a SOCKS proxy. David Nichols 2013-07-12 13:03:09 -0500
  • 97f0c56aa8 Adding configuration option to listen for connections when operating with a SOCKS proxy. David Nichols 2013-07-12 13:03:09 -0500
  • 9101606359
    python2-gevent is optional fuzzgun 2013-07-12 18:09:59 +0100
  • d3b76eb610 python2-gevent is optional fuzzgun 2013-07-12 18:09:59 +0100
  • d8f1715e1c
    Duplocated command in Makefile fuzzgun 2013-07-12 14:09:10 +0100
  • 33a41367b3 Duplocated command in Makefile fuzzgun 2013-07-12 14:09:10 +0100
  • 123677323d
    Some Arch dependencies fuzzgun 2013-07-12 14:03:11 +0100
  • 28d1bfa645 Some Arch dependencies fuzzgun 2013-07-12 14:03:11 +0100
  • 51edef7665 Change to @bm.addr Chuck 2013-07-12 18:32:17 +0700
  • 139fe29b80
    Fixing the puppy script fuzzgun 2013-07-12 12:07:55 +0100
  • 3364433765 Fixing the puppy script fuzzgun 2013-07-12 12:07:55 +0100
  • db80ac2020
    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. Gergö Barany 2013-07-12 12:16:34 +0200
  • 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. Gergö Barany 2013-07-12 12:16:34 +0200
  • 08d38ee22b fixing Chuck 2013-07-12 16:41:34 +0700
  • 8bb78913ea
    Packaging for multiple distros fuzzgun 2013-07-12 10:36:28 +0100
  • 10b23d0946 Packaging for multiple distros fuzzgun 2013-07-12 10:36:28 +0100
  • ee3ba55f44
    Fixed crash on sql query. Rainulf Pineda 2013-07-12 05:02:21 -0400
  • a3cdc28bbf Fixed crash on sql query. Rainulf Pineda 2013-07-12 05:02:21 -0400
  • e76d0e5549
    Sent search. Rainulf Pineda 2013-07-12 04:42:52 -0400
  • 997a8ff13a Sent search. Rainulf Pineda 2013-07-12 04:42:52 -0400
  • f1c3ad2066
    Inbox search. Rainulf Pineda 2013-07-12 04:24:24 -0400
  • 45cfead4d0 Inbox search. Rainulf Pineda 2013-07-12 04:24:24 -0400
  • 2c83579f54
    added translations akh81 2013-07-12 03:12:57 -0500
  • c1496551e6 added translations akh81 2013-07-12 03:12:57 -0500
  • 3993d9a0f4
    Generated py for search. Rainulf Pineda 2013-07-12 02:01:33 -0400
  • 855a9f963f Generated py for search. Rainulf Pineda 2013-07-12 02:01:33 -0400
  • d8da925b8d Change mail format to BMADDR@default. The word default can change. Also, get rid of the Bitmessage Mail tag in the subject line Chuck 2013-07-12 12:09:50 +0700
  • 9edc16d29a Merge fa53eb370c into eed8c66512 fiatflux 2013-07-11 16:09:24 -0700
  • 93301f8b72
    Clarify IOError handling with comment. Gregor Robinson 2013-07-11 23:58:10 +0100
  • fa53eb370c Clarify IOError handling with comment. Gregor Robinson 2013-07-11 23:58:10 +0100
  • 2a9840a3e1
    Updated bitmessageui for search. Rainulf Pineda 2013-07-11 03:23:39 -0400
  • 14266de0c6 Updated bitmessageui for search. Rainulf Pineda 2013-07-11 03:23:39 -0400
  • 1e3cd7fc88 some adjustments to the way headers are built for old-style messages Chuck 2013-07-11 02:47:16 +0700
  • f5c3da6901
    Switch an stderr message to logger. Gregor Robinson 2013-07-10 20:29:07 +0100
  • e8fa5aaefe Switch an stderr message to logger. Gregor Robinson 2013-07-10 20:29:07 +0100
  • 7e0a398e88
    Merge branch 'no_propagate_loggers' into keyfile_perm_fix Gregor Robinson 2013-07-10 20:24:23 +0100
  • 718de832ab Merge branch 'no_propagate_loggers' into keyfile_perm_fix Gregor Robinson 2013-07-10 20:24:23 +0100
  • cfd520603e Merge 3179ea30f0 into eed8c66512 fiatflux 2013-07-10 12:18:16 -0700
  • 17370bb5ff
    Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix Gregor Robinson 2013-07-10 20:18:10 +0100
  • 32ba57c108 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix Gregor Robinson 2013-07-10 20:18:10 +0100
  • ad01dc28f9
    These changes slipped from last commit. Sorry. Gregor Robinson 2013-07-10 20:15:04 +0100
  • 3179ea30f0 These changes slipped from last commit. Sorry. Gregor Robinson 2013-07-10 20:15:04 +0100
  • 5a7b10151c
    Don't propagate loggers; add some logging. Gregor Robinson 2013-07-10 19:50:18 +0100
  • 2e2db97250 Don't propagate loggers; add some logging. Gregor Robinson 2013-07-10 19:50:18 +0100
  • ebce2e29dd Supporting broadcasts and delivery to specific recipients Chuck 2013-07-10 20:24:33 +0700
  • cccb043b67 Reformat Date to GMT timestamps Chuck 2013-07-10 18:10:54 +0700
  • c7375b050b minor text fix Chuck 2013-07-10 17:07:46 +0700
  • 860434ea2b Revert "slight text modification" Chuck 2013-07-10 17:06:59 +0700
  • 4de441373a slight text modification Chuck 2013-07-10 17:04:11 +0700
  • 295341a9dd add printlocks Chuck 2013-07-10 17:02:45 +0700
  • 6eea004723 Strip message headers that could possibly lead to loss of anonymity Chuck 2013-07-10 17:00:26 +0700
  • f2e7ace603
    Logging fixes. Gregor Robinson 2013-07-10 11:43:18 +0300
  • a579e8f1d3 Logging fixes. Gregor Robinson 2013-07-10 11:43:18 +0300
  • cb7618f1b6 Adding special mailing list behavior for email formatted messages Chuck 2013-07-10 15:26:10 +0700
  • 91c02b7425
    Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-09 21:49:04 +0200
  • d95fc5afe0 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-09 21:49:04 +0200
  • aefc1562b4
    Merge pull request #290 from dpc/master Jonathan Warren 2013-07-09 10:08:19 -0700
  • eed8c66512 Merge pull request #290 from dpc/master Jonathan Warren 2013-07-09 10:08:19 -0700
  • b53031fe10 Merge e4869514ca into a3d21dc880 Dawid Ciężarkiewicz 2013-07-09 03:23:17 -0700
  • 9e8ac56aa7
    Add make uninstall. Dawid Ciężarkiewicz 2013-07-09 12:19:54 +0200
  • e4869514ca Add make uninstall. Dawid Ciężarkiewicz 2013-07-09 12:19:54 +0200
  • d5fed11e93
    Exit if dpkg-buildpackage fails. Dawid Ciężarkiewicz 2013-07-09 12:19:31 +0200
  • 2b2fa867f0 Exit if dpkg-buildpackage fails. Dawid Ciężarkiewicz 2013-07-09 12:19:31 +0200
  • cfe8e33a0c
    Spelling. Gregor Robinson 2013-07-08 23:33:15 +0300
  • 1ff1c1b8a5 Spelling. Gregor Robinson 2013-07-08 23:33:15 +0300