Commit Graph

  • 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
  • 28f9144113 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
  • 325feae91d
    Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master Jonathan Warren 2013-06-18 13:12:49 -0400
  • 461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master Jonathan Warren 2013-06-18 13:12:49 -0400
  • e5c319b033
    manually merge github pull request: Unicode chars in localtime prevented the gui from starting Jonathan Warren 2013-06-18 13:11:30 -0400
  • da0f486179 manually merge github pull request: Unicode chars in localtime prevented the gui from starting Jonathan Warren 2013-06-18 13:11:30 -0400
  • fcd5d533e0
    adjust code formatting Jonathan Warren 2013-06-18 12:56:03 -0400
  • 9ff2c9568f adjust code formatting Jonathan Warren 2013-06-18 12:56:03 -0400
  • a9e9a10605
    Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master Jonathan Warren 2013-06-18 12:45:55 -0400
  • 952524f7d5 Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master Jonathan Warren 2013-06-18 12:45:55 -0400
  • 797d0c9a4b
    update defaultKnownNodes Jonathan Warren 2013-06-18 12:37:13 -0400
  • 4f8742655d update defaultKnownNodes Jonathan Warren 2013-06-18 12:37:13 -0400
  • 789563b136
    Added more translatable strings Jonathan Warren 2013-06-18 11:30:42 -0400
  • 0b602f0f8c Added more translatable strings Jonathan Warren 2013-06-18 11:30:42 -0400
  • 8da0a523a7
    adjust translation-related code Jonathan Warren 2013-06-17 17:49:06 -0400
  • fa91d31f42 adjust translation-related code Jonathan Warren 2013-06-17 17:49:06 -0400
  • fd8040d93d
    Finished adjusted _translate function to work under daemon mode Jonathan Warren 2013-06-17 16:42:30 -0400
  • 48b5e26e46 Finished adjusted _translate function to work under daemon mode Jonathan Warren 2013-06-17 16:42:30 -0400
  • 3267cd7669 Merge 751fa39447 into 391df043f9 Alex Zhukov 2013-06-17 05:04:17 -0700
  • 751fa39447 Unicode characters in localtime raised and UnicodeError and prevented the qt gui from starting Alex Zhukov 2013-06-17 15:44:22 +0400
  • 1a786de34e Add FreeBSD OpenSSL support exception sunny-g 2013-06-16 22:10:04 -0500
  • 04b185224d
    Merge remote-tracking branch 'upstream/master' nimda 2013-06-16 20:55:28 -0400
  • 86f186d9b3 Merge remote-tracking branch 'upstream/master' nimda 2013-06-16 20:55:28 -0400
  • 9f71ce8d73 Merge 5a10d997f9 into 391df043f9 nimdahk 2013-06-16 15:43:43 -0700
  • 9e001a5814
    tabs? nimda 2013-06-16 18:38:27 -0400
  • 5a10d997f9 tabs? nimda 2013-06-16 18:38:27 -0400
  • 00bd665c31
    'Save message as...' option in Inbox nimda 2013-06-16 18:28:18 -0400
  • 3865d3cb9f 'Save message as...' option in Inbox nimda 2013-06-16 18:28:18 -0400
  • ecbca60e1b
    Make sure libcrypto from brew is linked. In the resulting .app Maran 2013-06-17 00:25:03 +0200
  • 5e66e81ab7 Make sure libcrypto from brew is linked. In the resulting .app Maran 2013-06-17 00:25:03 +0200
  • 8d85050e34
    Added OS X Build scripts Maran 2013-06-15 21:09:15 +0200
  • 3475000902 Added OS X Build scripts Maran 2013-06-15 21:09:15 +0200
  • 7f10023830
    Added OS X Build directories to ignore file Maran 2013-06-15 21:08:41 +0200
  • 1f622103ad Added OS X Build directories to ignore file Maran 2013-06-15 21:08:41 +0200
  • d44d297398
    Added OS X DS_Store files to git ignore Maran 2013-06-15 21:07:22 +0200
  • e3bb756ea3 Added OS X DS_Store files to git ignore Maran 2013-06-15 21:07:22 +0200
  • bdfcc1b763
    Manual merge and fix Github issue #213 Jonathan Warren 2013-06-14 15:58:46 -0400