Commit Graph

  • 5a95e11fe8 Merge pull request #319 from DivineOmega/fix_double_chan Jonathan Warren 2013-07-22 07:42:02 -0700
  • 3f139db24a Merge b488bb5cda into 8a0d0931fc DivineOmega 2013-07-22 02:42:29 -0700
  • 61c5bbe960
    Fixes double [chan] appearing when adding chan to address book DivineOmega 2013-07-22 10:40:19 +0100
  • b488bb5cda Fixes double [chan] appearing when adding chan to address book DivineOmega 2013-07-22 10:40:19 +0100
  • f997260cbf
    Merge pull request #316 from Atheros1/master Jonathan Warren 2013-07-21 22:54:39 -0700
  • 8a0d0931fc Merge pull request #316 from Atheros1/master Jonathan Warren 2013-07-21 22:54:39 -0700
  • d046496dd4 Merge 9c7e6600fa into 5f10b6b7f2 Jonathan Warren 2013-07-21 22:54:30 -0700
  • cd46fbbf61
    Modified one line to support international characters Jonathan Warren 2013-07-22 01:41:50 -0400
  • 9c7e6600fa Modified one line to support international characters Jonathan Warren 2013-07-22 01:41:50 -0400
  • 98e3fa9b5a
    add one line to last commit Jonathan Warren 2013-07-22 01:20:36 -0400
  • a3dd730c2a add one line to last commit Jonathan Warren 2013-07-22 01:20:36 -0400
  • ef93d4d090
    Completed chan integration in the GUI Jonathan Warren 2013-07-22 01:10:22 -0400
  • d036ca18ed Completed chan integration in the GUI Jonathan Warren 2013-07-22 01:10:22 -0400
  • f18110bc9b
    Added exception handling for sound playing dependencies Bob Mottram 2013-07-20 10:55:03 +0100
  • cfc23718ed Added exception handling for sound playing dependencies Bob Mottram 2013-07-20 10:55:03 +0100
  • 90771f377c Some cleanup in anticipation of IPV6. Gregor Robinson 2013-07-18 13:00:55 +0100
  • 63ac2b7846 Temporary workaround for hanging PoW. Gregor Robinson 2013-07-18 11:13:57 +0100
  • 6b0e982560
    Get default user/password in every case. Daniel Kraft 2013-07-18 07:09:49 +0200
  • 260bc80afe Get default user/password in every case. Daniel Kraft 2013-07-18 07:09:49 +0200
  • ec393fe598 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-17 21:55:34 +0200
  • b51fdea6fe add - function delete attachment bartekn80 2013-07-17 21:41:34 +0200
  • 47c1e84adb
    Also set RPC port default from namecoin.conf Daniel Kraft 2013-07-17 18:40:02 +0200
  • 25f0192fd6 Also set RPC port default from namecoin.conf Daniel Kraft 2013-07-17 18:40:02 +0200
  • 04108f80ba
    Read also rpcport from namecoin.conf. Daniel Kraft 2013-07-17 18:33:26 +0200
  • 810387df3e Read also rpcport from namecoin.conf. Daniel Kraft 2013-07-17 18:33:26 +0200
  • 52855d8e85
    Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-17 18:15:45 +0200
  • a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-17 18:15:45 +0200
  • be2cc97732
    Merge pull request #309 from akh81/russian-translation Jonathan Warren 2013-07-15 22:04:52 -0700
  • 5f10b6b7f2 Merge pull request #309 from akh81/russian-translation Jonathan Warren 2013-07-15 22:04:52 -0700
  • a18b682277 Merge d1ea944f0e into 56c13366a1 akh81 2013-07-15 21:58:32 -0700
  • d2afb93320
    complete Russian translation akh81 2013-07-15 23:52:08 -0500
  • d1ea944f0e complete Russian translation akh81 2013-07-15 23:52:08 -0500
  • 9d2fabc43e
    all translations complete akh81 2013-07-15 23:12:07 -0500
  • 1b722dca5c all translations complete akh81 2013-07-15 23:12:07 -0500
  • b6ea3ccb72
    all translations complete akh81 2013-07-15 23:10:36 -0500
  • 5f8209698f all translations complete akh81 2013-07-15 23:10:36 -0500
  • 4f1dee938e
    Merge pull request #308 from Atheros1/master Jonathan Warren 2013-07-15 16:37:39 -0700
  • 56c13366a1 Merge pull request #308 from Atheros1/master Jonathan Warren 2013-07-15 16:37:39 -0700
  • b27cfe307c Merge 151ca020df into 0ad36d011a Jonathan Warren 2013-07-15 16:37:35 -0700
  • 73b6a8035f
    Correct indent on a single line Jonathan Warren 2013-07-15 19:36:37 -0400
  • 151ca020df Correct indent on a single line Jonathan Warren 2013-07-15 19:36:37 -0400
  • 36d0bcbb0e
    Merge pull request #307 from Atheros1/master Jonathan Warren 2013-07-15 16:35:13 -0700
  • 0ad36d011a Merge pull request #307 from Atheros1/master Jonathan Warren 2013-07-15 16:35:13 -0700
  • 9d33bc5350 Merge c6291f55ef into 73f3b5d92c Jonathan Warren 2013-07-15 16:35:09 -0700
  • 5f66a8225a
    Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-07-15 19:28:31 -0400
  • c6291f55ef Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-07-15 19:28:31 -0400
  • 33fbd49faa
    Store msgid in sent table Jonathan Warren 2013-07-15 19:27:53 -0400
  • 3427bc5c26 Store msgid in sent table Jonathan Warren 2013-07-15 19:27:53 -0400
  • c6b333f0d3
    Merge pull request #297 from mybluevan/master Jonathan Warren 2013-07-15 15:05:15 -0700
  • 73f3b5d92c Merge pull request #297 from mybluevan/master Jonathan Warren 2013-07-15 15:05:15 -0700
  • 146fcebd8d Merge 922cce6558 into 68a2069329 David Nichols 2013-07-15 15:00:49 -0700
  • 92700190aa
    Merge pull request #306 from Atheros1/master Jonathan Warren 2013-07-15 12:51:27 -0700
  • 68a2069329 Merge pull request #306 from Atheros1/master Jonathan Warren 2013-07-15 12:51:27 -0700
  • c7c1353ee0 Merge 08694ecc38 into 823363b236 Jonathan Warren 2013-07-15 12:51:21 -0700
  • 270f15c123 fix save attach on sended message rename sendtextedit qedittext to qbrowseEdt bartekn80 2013-07-15 21:50:48 +0200
  • 977b02622f
    Portable mode moves debug.log Jonathan Warren 2013-07-15 15:45:03 -0400
  • 08694ecc38 Portable mode moves debug.log Jonathan Warren 2013-07-15 15:45:03 -0400
  • 3382bd46c5 small fix - add folder Downloads for attachmets bartekn80 2013-07-15 21:09:16 +0200
  • bdf6741016 add - viewing messages with attachmets. bartekn80 2013-07-15 20:29:07 +0200
  • 67cf37819e Merge a7a2de1d24 into 823363b236 Bob Mottram 2013-07-15 10:13:37 -0700
  • 17dcd7ae21
    Fixed freeze on Ubuntu fuzzgun 2013-07-15 18:13:21 +0100
  • a7a2de1d24 Fixed freeze on Ubuntu fuzzgun 2013-07-15 18:13:21 +0100
  • 0227fbe8e7 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-15 19:07:09 +0200
  • b628b0b4e6
    Use subprocess.call fuzzgun 2013-07-15 17:58:22 +0100
  • 3e13468695 Use subprocess.call fuzzgun 2013-07-15 17:58:22 +0100
  • b363506a24
    Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm Jonathan Warren 2013-07-15 12:24:08 -0400
  • 558dcf8550 Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm Jonathan Warren 2013-07-15 12:24:08 -0400
  • 659fa130c0
    Merge pull request #304 from Atheros1/master Jonathan Warren 2013-07-15 09:22:27 -0700
  • 823363b236 Merge pull request #304 from Atheros1/master Jonathan Warren 2013-07-15 09:22:27 -0700
  • c1ab3b44e2 Merge 52caec5e2b into 5ca0eac7a9 Jonathan Warren 2013-07-15 09:22:24 -0700
  • 6448c25408
    Move one line of code so that correct program activity is logged Jonathan Warren 2013-07-15 12:19:53 -0400
  • 52caec5e2b Move one line of code so that correct program activity is logged Jonathan Warren 2013-07-15 12:19:53 -0400
  • 593a61f19b
    Play sounds on connection/disconnection or when messages arrive fuzzgun 2013-07-15 17:01:12 +0100
  • 1ab664564b Play sounds on connection/disconnection or when messages arrive fuzzgun 2013-07-15 17:01:12 +0100
  • 353b1be3d0
    Merge pull request #302 from DivineOmega/fix_missing_logger Jonathan Warren 2013-07-15 08:32:26 -0700
  • 5ca0eac7a9 Merge pull request #302 from DivineOmega/fix_missing_logger Jonathan Warren 2013-07-15 08:32:26 -0700
  • b5f763c500 Merge 3107150ace into b500a01c33 DivineOmega 2013-07-15 03:00:09 -0700
  • fedb0c70df
    Added fall back print statements in case logger is unavailable DivineOmega 2013-07-15 10:56:13 +0100
  • 3107150ace Added fall back print statements in case logger is unavailable DivineOmega 2013-07-15 10:56:13 +0100
  • c9314c0c59
    Added check for logger global before attempting to log in places where logging may occur before the logger is ready DivineOmega 2013-07-15 10:49:01 +0100
  • d900b9de70 Added check for logger global before attempting to log in places where logging may occur before the logger is ready DivineOmega 2013-07-15 10:49:01 +0100
  • 75e1004d09 Merge remote-tracking branch 'upstream/master' Chuck 2013-07-15 12:49:40 +0700
  • 5c1e7360f2 use better syntax Chuck 2013-07-15 12:43:45 +0700
  • 2b0adb48a0
    Merge remote-tracking branch 'upstream/master' Nimda 2013-07-14 22:45:26 -0400
  • 2185b27b1e Merge remote-tracking branch 'upstream/master' Nimda 2013-07-14 22:45:26 -0400
  • b4deaccbb5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-14 23:37:26 +0200
  • bde6124cc7 read attachment and save bartekn80 2013-07-14 23:32:51 +0200
  • e092d897c7
    Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master Jonathan Warren 2013-07-14 17:25:36 -0400
  • d905bd8724 Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master Jonathan Warren 2013-07-14 17:25:36 -0400
  • faa9c86bd4
    manual merge, fix minor import issue Jonathan Warren 2013-07-14 17:10:37 -0400
  • 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