Commit Graph

  • f455918326 Don't send acks to ignored senders. nimdahk 2013-07-30 19:24:24 -0400
  • 70e08016c5
    Fix: Distinguish peers by both IP address and port. Until now many parts of the code assumed that IP addresses are unique for peers. However, more than one Bitmessage instance might be running with a given IP address due to multi-user systems or firewalls. nobody 2013-07-30 22:23:18 +0200
  • d606bb1333 Fix: Distinguish peers by both IP address and port. Until now many parts of the code assumed that IP addresses are unique for peers. However, more than one Bitmessage instance might be running with a given IP address due to multi-user systems or firewalls. nobody 2013-07-30 22:23:18 +0200
  • 7904eeb7ca Merge 85558d2698 into 0780ac4787 bartekn80 2013-07-30 12:58:49 -0700
  • 85558d2698 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-30 21:56:36 +0200
  • 5e2ae86bca Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage bartekn80 2013-07-30 21:53:48 +0200
  • ec87aa6d81 merge latest upstream nimdahk 2013-07-29 21:44:39 -0400
  • 2684415238
    Update build_osx.py gnumac 2013-07-30 00:24:04 +0000
  • 29be0d55db Update build_osx.py gnumac 2013-07-30 00:24:04 +0000
  • c74f7cd5e2 Merge 97df9e04f1 into 0780ac4787 Bob Mottram 2013-07-29 14:23:22 -0700
  • 1dfb96167e
    Changed version to 0.3.5 Bob Mottram 2013-07-29 22:22:17 +0100
  • 97df9e04f1 Changed version to 0.3.5 Bob Mottram 2013-07-29 22:22:17 +0100
  • b5c1f6555f
    -aChanged version to 0.3.5 Bob Mottram 2013-07-29 22:19:15 +0100
  • 2b17991ee4 -aChanged version to 0.3.5 Bob Mottram 2013-07-29 22:19:15 +0100
  • d85c785294 Merging in latest chan stuff from upstream Chuck 2013-07-29 16:20:13 +0700
  • 6f51c8966d
    Merge pull request #342 from Atheros1/master Jonathan Warren 2013-07-28 15:46:13 -0700
  • 0780ac4787 Merge pull request #342 from Atheros1/master Jonathan Warren 2013-07-28 15:46:13 -0700
  • f3d8dd6ba5 Merge aa66d74d8d into df3bc5d314 Jonathan Warren 2013-07-28 15:46:00 -0700
  • a634109bd6
    Small backwards-compatible changes to API Jonathan Warren 2013-07-28 18:25:52 -0400
  • aa66d74d8d Small backwards-compatible changes to API Jonathan Warren 2013-07-28 18:25:52 -0400
  • 6ef5369cdb
    Merge pull request #338 from DivineOmega/return_read_status Jonathan Warren 2013-07-28 14:59:06 -0700
  • df3bc5d314 Merge pull request #338 from DivineOmega/return_read_status Jonathan Warren 2013-07-28 14:59:06 -0700
  • eb75d9c405 Merge 82282b03fe into ac93b04f73 DivineOmega 2013-07-28 14:57:35 -0700
  • 7078bb2e94 Merge 665659f214 into ac93b04f73 Daniel Kraft 2013-07-28 14:55:26 -0700
  • 604534b49e
    Increment version number to 0.3.5 Jonathan Warren 2013-07-28 16:43:00 -0400
  • ac93b04f73 Increment version number to 0.3.5 v0.3.5 Jonathan Warren 2013-07-28 16:43:00 -0400
  • 45edf8ced9
    Merge pull request #335 from nimdahk/markUnread Jonathan Warren 2013-07-28 13:30:59 -0700
  • ddf3f63995 Merge pull request #335 from nimdahk/markUnread Jonathan Warren 2013-07-28 13:30:59 -0700
  • 1138f4dd98 Merge 5d2eb5ef1c into 7fde12a63f nimdahk 2013-07-28 13:29:03 -0700
  • dd4b361ad7
    Merge pull request #339 from akh81/master Jonathan Warren 2013-07-28 13:28:41 -0700
  • 7fde12a63f Merge pull request #339 from akh81/master Jonathan Warren 2013-07-28 13:28:41 -0700
  • fcf96a05b2
    Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-27 08:24:52 +0200
  • 665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id Daniel Kraft 2013-07-27 08:24:52 +0200
  • 6d6b866c02 Merge 0284a965f3 into 77ea6c1801 akh81 2013-07-26 22:22:02 -0700
  • 81e27e40b9
    updated Russian translation: new translations dealing with chans akh81 2013-07-27 00:01:31 -0500
  • 0284a965f3 updated Russian translation: new translations dealing with chans akh81 2013-07-27 00:01:31 -0500
  • 3cb04ff7a7
    Made inbox message retrieval API function also return read status Jordan Hall 2013-07-27 00:38:38 +0100
  • 82282b03fe Made inbox message retrieval API function also return read status Jordan Hall 2013-07-27 00:38:38 +0100
  • b83776613d Merge 3f6502f88d into 77ea6c1801 akh81 2013-07-26 02:09:38 -0700
  • 87b4bfd695
    updated Russian translation: new translations dealing with chans akh81 2013-07-26 04:04:02 -0500
  • 3f6502f88d updated Russian translation: new translations dealing with chans akh81 2013-07-26 04:04:02 -0500
  • 30030245b0
    more comments on the mark unread implementation nimdahk 2013-07-25 23:56:38 -0400
  • 5d2eb5ef1c more comments on the mark unread implementation nimdahk 2013-07-25 23:56:38 -0400
  • 8d2fdca2ac
    Tabs are the root of all evil Nimda 2013-07-25 22:20:53 -0400
  • 43cbf69103 Tabs are the root of all evil Nimda 2013-07-25 22:20:53 -0400
  • a41cd6cd5e
    Remove selecting of next message. It doesn't seem to be necessary, and it would always fail if there was only one message in the inbox. Nimda 2013-07-25 22:10:22 -0400
  • ddaa1413a6 Remove selecting of next message. It doesn't seem to be necessary, and it would always fail if there was only one message in the inbox. Nimda 2013-07-25 22:10:22 -0400
  • 725dff10e4
    initial commit. Probably broken. Nimda 2013-07-25 22:00:54 -0400
  • d3dfc5a0f7 initial commit. Probably broken. Nimda 2013-07-25 22:00:54 -0400
  • ca383141aa
    Merge remote-tracking branch 'upstream/master': Pull latest updates Nimda 2013-07-25 21:46:16 -0400
  • d9f894448d Merge remote-tracking branch 'upstream/master': Pull latest updates Nimda 2013-07-25 21:46:16 -0400
  • 7fb2fe66a2
    Merge pull request #330 from gnumac/master Jonathan Warren 2013-07-24 10:21:48 -0700
  • 77ea6c1801 Merge pull request #330 from gnumac/master Jonathan Warren 2013-07-24 10:21:48 -0700
  • 11829b20cc Merge 79ecaf4285 into 63b201e6a8 gnumac 2013-07-24 10:21:29 -0700
  • 860bbb82d4
    Merge pull request #333 from Atheros1/master Jonathan Warren 2013-07-24 09:45:07 -0700
  • 63b201e6a8 Merge pull request #333 from Atheros1/master Jonathan Warren 2013-07-24 09:45:07 -0700
  • 352c39b437 Merge c27494ace9 into 700a85c3f4 Jonathan Warren 2013-07-24 09:45:03 -0700
  • ac1231165e
    Further work to implement the Connect dialog on startup Jonathan Warren 2013-07-24 12:43:51 -0400
  • c27494ace9 Further work to implement the Connect dialog on startup Jonathan Warren 2013-07-24 12:43:51 -0400
  • df55768c5d
    Merge pull request #332 from Atheros1/master Jonathan Warren 2013-07-24 08:53:40 -0700
  • 700a85c3f4 Merge pull request #332 from Atheros1/master Jonathan Warren 2013-07-24 08:53:40 -0700
  • 8913e26401 Merge bfd2d35a57 into 9035ba40b4 Jonathan Warren 2013-07-24 08:53:18 -0700
  • 8f2b6cc413
    add the connect.py file Jonathan Warren 2013-07-24 11:49:48 -0400
  • bfd2d35a57 add the connect.py file Jonathan Warren 2013-07-24 11:49:48 -0400
  • a9710bbdc4
    Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst Jonathan Warren 2013-07-24 11:46:41 -0400
  • ebccf1e6e0 Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst Jonathan Warren 2013-07-24 11:46:41 -0400
  • 203a05a242
    Prompt user to connect at first startup Jonathan Warren 2013-07-24 11:46:28 -0400
  • 350e8d66c7 Prompt user to connect at first startup Jonathan Warren 2013-07-24 11:46:28 -0400
  • 62021387a2
    Added 'sqlite3' as to the includes when building for OS X gnumac 2013-07-24 05:23:24 +0000
  • 79ecaf4285 Added 'sqlite3' as to the includes when building for OS X gnumac 2013-07-24 05:23:24 +0000
  • df24cbc45d
    Merge pull request #329 from Atheros1/master Jonathan Warren 2013-07-23 21:31:51 -0700
  • 9035ba40b4 Merge pull request #329 from Atheros1/master Jonathan Warren 2013-07-23 21:31:51 -0700
  • 097cf2928a Merge daa058528f into a76939114e Jonathan Warren 2013-07-23 21:31:38 -0700
  • e6f00d9718
    Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-07-24 00:30:40 -0400
  • daa058528f Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-07-24 00:30:40 -0400
  • 7c4361bbf6
    Moved code to add the sockslisten config option to a spot where it will actually work properly Jonathan Warren 2013-07-24 00:29:30 -0400
  • f5e17eeeaa Moved code to add the sockslisten config option to a spot where it will actually work properly Jonathan Warren 2013-07-24 00:29:30 -0400
  • 0cc2c5e9d4 Merge ce921bf199 into a76939114e fiatflux 2013-07-23 14:14:21 -0700
  • 840aa792c2
    manual merge2 Jonathan Warren 2013-07-23 17:05:42 -0400
  • a76939114e manual merge2 Jonathan Warren 2013-07-23 17:05:42 -0400
  • 3bb7508d6f
    Merge pull request #328 from fuzzgun/master Jonathan Warren 2013-07-23 14:02:16 -0700
  • 1eab66690c Merge pull request #328 from fuzzgun/master Jonathan Warren 2013-07-23 14:02:16 -0700
  • 6f1864ef6f Merge 1e78685a98 into 5c93835f09 Bob Mottram 2013-07-23 13:34:20 -0700
  • 2080063477
    Fixed missing repository Bob Mottram 2013-07-23 21:31:55 +0100
  • 1e78685a98 Fixed missing repository Bob Mottram 2013-07-23 21:31:55 +0100
  • 2adf7ebdd6
    Fixing /usr versus /usr/local dilemmas Bob Mottram 2013-07-23 21:20:58 +0100
  • ba2958d076 Fixing /usr versus /usr/local dilemmas Bob Mottram 2013-07-23 21:20:58 +0100
  • eb3ec589bb
    Merge pull request #321 from neko259/master Jonathan Warren 2013-07-23 13:20:18 -0700
  • 5c93835f09 Merge pull request #321 from neko259/master Jonathan Warren 2013-07-23 13:20:18 -0700
  • 2242da6305 Merge 3638ed8856 into f584a8aae5 neko259 2013-07-23 13:19:39 -0700
  • cfb88397b6
    Merge pull request #327 from Atheros1/master Jonathan Warren 2013-07-23 12:37:45 -0700
  • f584a8aae5 Merge pull request #327 from Atheros1/master Jonathan Warren 2013-07-23 12:37:45 -0700
  • e9be7d3b59 Merge 5c1d737313 into 833bafb6df Jonathan Warren 2013-07-23 12:37:27 -0700
  • 6ae99a4c38
    manual merge Jonathan Warren 2013-07-23 15:36:12 -0400
  • 5c1d737313 manual merge Jonathan Warren 2013-07-23 15:36:12 -0400
  • 008ba51170
    Merge pull request #325 from postmodern/makefile-fixes Jonathan Warren 2013-07-23 12:27:13 -0700
  • 833bafb6df Merge pull request #325 from postmodern/makefile-fixes Jonathan Warren 2013-07-23 12:27:13 -0700
  • 7723e2a290
    Improving the Ebuild Bob Mottram 2013-07-23 16:04:44 +0100
  • 2af86c8296 Improving the Ebuild Bob Mottram 2013-07-23 16:04:44 +0100
  • 1474d1b258 Merge 84f952d76c into 5a95e11fe8 Postmodern 2013-07-22 23:31:37 -0700