Commit Graph

  • a46e4e457e Converted more print statements into logger calls' Carlos Killpack 2013-06-20 16:36:45 -0600
  • ad2aa79a82 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage Carlos Killpack 2013-06-20 16:08:24 -0600
  • f6af9a5aeb
    Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain Jordan Hall 2013-06-20 22:23:12 +0100
  • 181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain Jordan Hall 2013-06-20 22:23:12 +0100
  • 4d772a67e4
    Moving certain classes outside of bitmessagemain.py Jordan Hall 2013-06-20 22:23:03 +0100
  • ebc62b9edc Moving certain classes outside of bitmessagemain.py Jordan Hall 2013-06-20 22:23:03 +0100
  • b587d63db4
    Merge pull request #232 from DivineOmega/ackdata_api_changes Jonathan Warren 2013-06-20 13:47:28 -0700
  • 958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes Jonathan Warren 2013-06-20 13:47:28 -0700
  • 95306a48e2 Merge e49e9a60b0 into 7f1d8cb0d2 DivineOmega 2013-06-20 13:45:52 -0700
  • cbd82da434
    Merge pull request #237 from Atheros1/master Jonathan Warren 2013-06-20 13:42:52 -0700
  • 7f1d8cb0d2 Merge pull request #237 from Atheros1/master Jonathan Warren 2013-06-20 13:42:52 -0700
  • cdbcaa979f Merge 936369da0a into b2f8a76b58 Jonathan Warren 2013-06-20 13:42:49 -0700
  • 98326d7477
    manual implement Github issue #223 Jonathan Warren 2013-06-20 16:41:14 -0400
  • 936369da0a manual implement Github issue #223 Jonathan Warren 2013-06-20 16:41:14 -0400
  • 0f0ff3ae6b Don't log self.data Gregor Robinson 2013-06-20 14:38:05 -0600
  • 3cfbc23680 Merge remote-tracking branch 'xj9/master' Gregor Robinson 2013-06-20 14:31:00 -0600
  • 0899cb9692
    manuall merge github issue #229 Jonathan Warren 2013-06-20 16:04:50 -0400
  • a6c9ff288e manuall merge github issue #229 Jonathan Warren 2013-06-20 16:04:50 -0400
  • dcb29d0c5b Undoing stupid unintentional formatting change. Gregor Robinson 2013-06-20 13:53:41 -0600
  • 521c800168 Continue migration from print messages Gregor Robinson 2013-06-20 13:47:52 -0600
  • 87cbfe9434 Continuing migration from print-based logging. Gregor Robinson 2013-06-20 13:17:11 -0600
  • da687134e2 Updated in reponse to comments in pull/234, changed some more print statements into logger calls Carlos Killpack 2013-06-20 12:16:21 -0600
  • 5e93256be6 That was supposed to be in a different branch Carlos Killpack 2013-06-20 10:14:42 -0600
  • 4b12b52e0f Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into debug Carlos Killpack 2013-06-20 10:06:12 -0600
  • f91a3c78c3 Created a logging configuration that supports various log levels, multiple output streams, and is inherently thread-safe. Changed some print calls to logger calls in bitmessagemain Carlos Killpack 2013-06-20 09:49:28 -0600
  • b870930041
    New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData jordan@hall05.co.uk 2013-06-20 13:04:34 +0000
  • e49e9a60b0 New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData jordan@hall05.co.uk 2013-06-20 13:04:34 +0000
  • 71e3743e1e
    Merge pull request #231 from Atheros1/master Jonathan Warren 2013-06-20 05:00:16 -0700
  • b2f8a76b58 Merge pull request #231 from Atheros1/master Jonathan Warren 2013-06-20 05:00:16 -0700
  • d3f80122d6 Merge 58f3304244 into 29c5282d48 Jonathan Warren 2013-06-20 05:00:07 -0700
  • 1f8bb3a8a9
    When using API command getInboxMessagesByAddress, display true encoding type saved in table Jonathan Warren 2013-06-20 07:58:37 -0400
  • 58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table Jonathan Warren 2013-06-20 07:58:37 -0400
  • 27f0c7cfa2
    manual merge acejam-master Jonathan Warren 2013-06-20 07:52:39 -0400
  • 29c5282d48 manual merge acejam-master Jonathan Warren 2013-06-20 07:52:39 -0400
  • 5f17b74832
    manual merge acejam-master Jonathan Warren 2013-06-20 07:51:02 -0400
  • 76f851b7a2 manual merge acejam-master Jonathan Warren 2013-06-20 07:51:02 -0400
  • 6f0644659c
    Merge branch 'api_improvements' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-api_improvements Jonathan Warren 2013-06-20 07:38:03 -0400
  • 0179fa0e4c Merge branch 'api_improvements' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-api_improvements Jonathan Warren 2013-06-20 07:38:03 -0400
  • bbc21a6fd7
    Merge pull request #222 from DivineOmega/master Jonathan Warren 2013-06-20 04:27:20 -0700
  • 8addc44570 Merge pull request #222 from DivineOmega/master Jonathan Warren 2013-06-20 04:27:20 -0700
  • 414c781cfc Adding spanish translation Carlos Killpack 2013-06-20 01:03:49 -0600
  • f0d2d05313 Merge c655b9a506 into 23bfb0e304 acejam 2013-06-19 22:05:38 -0700
  • 0e1efbff0f
    Add getInboxMessagesByAddress API command Joshua Noble 2013-06-20 00:49:28 -0400
  • c655b9a506 Add getInboxMessagesByAddress API command Joshua Noble 2013-06-20 00:49:28 -0400
  • c8a4602908
    Merge remote-tracking branch 'upstream/master': new changes and merged features nimda 2013-06-19 20:55:52 -0400
  • d00cbe3a50 Merge remote-tracking branch 'upstream/master': new changes and merged features nimda 2013-06-19 20:55:52 -0400
  • eb0ba7fd76 Merge 96261b09bd into 23bfb0e304 DivineOmega 2013-06-19 16:15:11 -0700
  • f34a20d8eb
    Merge remote-tracking branch 'upsteam/master' Jordan Hall 2013-06-20 00:14:18 +0100
  • 96261b09bd Merge remote-tracking branch 'upsteam/master' Jordan Hall 2013-06-20 00:14:18 +0100
  • 3cee62944f Merge 4aa0207727 into 23bfb0e304 DivineOmega 2013-06-19 15:21:33 -0700
  • e848030c62
    Merging with upstream and resolving conflicts Jordan Hall 2013-06-19 23:11:35 +0100
  • 4aa0207727 Merging with upstream and resolving conflicts Jordan Hall 2013-06-19 23:11:35 +0100
  • 9c8160f491
    Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces. Jordan Hall 2013-06-19 23:02:36 +0100
  • 21ec1de7ca Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces. Jordan Hall 2013-06-19 23:02:36 +0100
  • f930df911b
    Added parameters check for getInboxMessageById and getSentMessageById API commands Jordan Hall 2013-06-19 22:50:00 +0100
  • 7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands Jordan Hall 2013-06-19 22:50:00 +0100
  • 9c90e193e0
    Merge pull request #227 from pfista/master Jonathan Warren 2013-06-19 14:48:01 -0700
  • 23bfb0e304 Merge pull request #227 from pfista/master Jonathan Warren 2013-06-19 14:48:01 -0700
  • a7b189ab43 Merge 9ebf6c159f into a6704ac5dc michael 2013-06-19 14:45:11 -0700
  • 0dc82a240a
    Removed duplicate import statement for threading Michael Pfister 2013-06-19 16:42:30 -0500
  • 9ebf6c159f Removed duplicate import statement for threading Michael Pfister 2013-06-19 16:42:30 -0500
  • 5f3f28e1c1
    Merge pull request #226 from Atheros1/master Jonathan Warren 2013-06-19 13:51:36 -0700
  • a6704ac5dc Merge pull request #226 from Atheros1/master Jonathan Warren 2013-06-19 13:51:36 -0700
  • a91d4307e2 Merge 930a12fec7 into 8b08ba1801 Jonathan Warren 2013-06-19 13:51:32 -0700
  • f6de8ace7b
    manual merge, also be careful of international characters Jonathan Warren 2013-06-19 16:49:31 -0400
  • 930a12fec7 manual merge, also be careful of international characters Jonathan Warren 2013-06-19 16:49:31 -0400
  • b20773aaef
    Added clientStatus API call Jonathan Warren 2013-06-19 15:33:42 -0400
  • 5dcfa962dd Added clientStatus API call Jonathan Warren 2013-06-19 15:33:42 -0400
  • bb3fdb1564
    Merge pull request #225 from Atheros1/master Jonathan Warren 2013-06-19 10:16:58 -0700
  • 8b08ba1801 Merge pull request #225 from Atheros1/master Jonathan Warren 2013-06-19 10:16:58 -0700
  • d4b1339e97 Merge 69267fb6fe into c5074800f6 Jonathan Warren 2013-06-19 10:16:52 -0700
  • fd67ccb904
    Fix issue #212 to support international characters Jonathan Warren 2013-06-19 13:10:43 -0400
  • 69267fb6fe Fix issue #212 to support international characters Jonathan Warren 2013-06-19 13:10:43 -0400
  • e77c5ac68f
    Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild Jonathan Warren 2013-06-19 12:44:22 -0400
  • c3f24f1088 Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild Jonathan Warren 2013-06-19 12:44:22 -0400
  • e0f0613f71
    Manual merge github issue #212 Jonathan Warren 2013-06-19 12:19:07 -0400
  • 5aedc385b8 Manual merge github issue #212 Jonathan Warren 2013-06-19 12:19:07 -0400
  • b45cc0de33 Merge 5e66e81ab7 into c5074800f6 Maran H 2013-06-19 08:35:52 -0700
  • bc08cadb30
    Merge pull request #224 from Atheros1/master Jonathan Warren 2013-06-19 07:55:24 -0700
  • c5074800f6 Merge pull request #224 from Atheros1/master Jonathan Warren 2013-06-19 07:55:24 -0700
  • 12286c22fd Merge 9d7a869cb9 into 391df043f9 Jonathan Warren 2013-06-19 07:55:16 -0700
  • 931c7f6346
    Fixed indentation error (previous commit contained no files) jordan@hall05.co.uk 2013-06-19 12:29:28 +0000
  • 28ed9676cc Fixed indentation error (previous commit contained no files) jordan@hall05.co.uk 2013-06-19 12:29:28 +0000
  • 6617ecdd0f
    Fixed indentation error. jordan@hall05.co.uk 2013-06-19 13:10:25 +0100
  • b8250ae04f Fixed indentation error. jordan@hall05.co.uk 2013-06-19 13:10:25 +0100
  • 0c71b26954
    Added 'getAllInboxMessages' command to API. jordan@hall05.co.uk 2013-06-19 12:06:46 +0000
  • 3f07f895bc Added 'getAllInboxMessages' command to API. jordan@hall05.co.uk 2013-06-19 12:06:46 +0000
  • d6517f2fd9
    Changed received to 'lastActionTime' for 'getSentMessageById' command. jordan@hall05.co.uk 2013-06-19 12:02:52 +0000
  • ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command. jordan@hall05.co.uk 2013-06-19 12:02:52 +0000
  • a8458f6c5c
    Added 'getSentMessageById' command to API jordan@hall05.co.uk 2013-06-19 11:57:41 +0000
  • fba402ab18 Added 'getSentMessageById' command to API jordan@hall05.co.uk 2013-06-19 11:57:41 +0000
  • b41278be6c Merge dfcb117b49 into 391df043f9 Bob Mottram 2013-06-19 03:30:37 -0700
  • dfcb117b49 Bug fix: convert from Qstring to standard string fuzzgun 2013-06-19 11:21:56 +0100
  • 42aea56526
    Added 'getAllSentMessages' command to API jordan@hall05.co.uk 2013-06-19 09:46:55 +0000
  • d79d002dd3 Added 'getAllSentMessages' command to API jordan@hall05.co.uk 2013-06-19 09:46:55 +0000
  • 2b548c0f6d
    Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW Jonathan Warren 2013-06-19 00:51:31 -0400
  • 9d7a869cb9 Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW Jonathan Warren 2013-06-19 00:51:31 -0400
  • c263fc2472
    Moved UI related files all into the bitmessageqt folder Jonathan Warren 2013-06-18 13:59:51 -0400
  • aeeb7c9878 Moved UI related files all into the bitmessageqt folder Jonathan Warren 2013-06-18 13:59:51 -0400
  • e3debecd6a
    When using API, start giving user actual message encoding type now that the inbox table actually tracks it Jonathan Warren 2013-06-18 13:24:35 -0400