Commit Graph

  • 9e8cbd0f0e class_singleCleaner uses helper_sql Grant T. Olson 2013-08-27 08:46:57 -0400
  • 3f07e755a6
    Have helper_inbox use helper_sql Grant T. Olson 2013-08-27 08:13:40 -0400
  • 5b23d99907 Have helper_inbox use helper_sql Grant T. Olson 2013-08-27 08:13:40 -0400
  • 933d5990c0
    Have bitmessageqt use sql helpers Grant T. Olson 2013-08-26 20:01:19 -0400
  • 7a53d2950b Have bitmessageqt use sql helpers Grant T. Olson 2013-08-26 20:01:19 -0400
  • c334cb3de3
    Have API calls use sql helper Grant T. Olson 2013-08-26 20:00:53 -0400
  • 74cd6c24b2 Have API calls use sql helper Grant T. Olson 2013-08-26 20:00:53 -0400
  • d42a087ac2
    Move duplicated sql code into helper Grant T. Olson 2013-08-26 20:00:30 -0400
  • edf9101eae Move duplicated sql code into helper Grant T. Olson 2013-08-26 20:00:30 -0400
  • f255ad0301
    Merge branch 'upstream/master' sendiulo 2013-08-27 12:10:46 +0200
  • 6c20d83edc Merge branch 'upstream/master' sendiulo 2013-08-27 12:10:46 +0200
  • 0884533481
    Identicons working in most lists, but not working for new items yet. sendiulo 2013-08-27 11:47:14 +0200
  • deeac2c99b Identicons working in most lists, but not working for new items yet. sendiulo 2013-08-27 11:47:14 +0200
  • cf605ba0d1
    Added trashSentMessageByAckData API command Joshua Noble 2013-08-26 22:29:57 -0400
  • b5f42d7549 Added trashSentMessageByAckData API command Joshua Noble 2013-08-26 22:29:57 -0400
  • 17cddd7735
    Merge pull request #450 from Atheros1/master Jonathan Warren 2013-08-26 12:29:30 -0700
  • 61c9251183 Merge pull request #450 from Atheros1/master Jonathan Warren 2013-08-26 12:29:30 -0700
  • 0cf38dbc0a Merge 0ca9ba9dc1 into 7ad8ce7e1b Jonathan Warren 2013-08-26 12:29:25 -0700
  • 9825f2bf49
    Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-08-26 15:27:51 -0400
  • 0ca9ba9dc1 Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-08-26 15:27:51 -0400
  • 8f00a14fed
    undid support for receiving v4 addresses until more chanages are implemented Jonathan Warren 2013-08-26 15:23:12 -0400
  • 1bb86794a8 undid support for receiving v4 addresses until more chanages are implemented Jonathan Warren 2013-08-26 15:23:12 -0400
  • 3697ba5d95 check enironmental variable BITMESSAGE_HOME to see if we should store config files there Jonathan Warren 2013-08-26 14:31:59 -0400
  • 0b2df029bc Merge 732d7c999a into 7ad8ce7e1b Grant Olson 2013-08-26 05:47:52 -0700
  • 5dc0814b93
    Allow specification of alternate settings dir via BITMESSAGE_HOME Grant T. Olson 2013-08-26 08:44:15 -0400
  • 732d7c999a Allow specification of alternate settings dir via BITMESSAGE_HOME Grant T. Olson 2013-08-26 08:44:15 -0400
  • 6cd15ab5e1
    log traceback on API exception Jonathan Warren 2013-08-26 00:06:49 -0400
  • 3ae8dd8eee log traceback on API exception Jonathan Warren 2013-08-26 00:06:49 -0400
  • 2968d93d7d
    Merge pull request #446 from Atheros1/master Jonathan Warren 2013-08-25 20:52:52 -0700
  • 7ad8ce7e1b Merge pull request #446 from Atheros1/master Jonathan Warren 2013-08-25 20:52:52 -0700
  • 6cc9805488 Merge 14a968b499 into 3c90728e69 Jonathan Warren 2013-08-25 20:52:33 -0700
  • 5413c2b966
    github demanded a manual merge Jonathan Warren 2013-08-25 22:52:38 -0400
  • 14a968b499 github demanded a manual merge Jonathan Warren 2013-08-25 22:52:38 -0400
  • 31dab4ec87
    Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error Jonathan Warren 2013-08-25 22:38:51 -0400
  • 0d69ebb125 Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error Jonathan Warren 2013-08-25 22:38:51 -0400
  • 604104887e
    Merge pull request #442 from Atheros1/master Jonathan Warren 2013-08-25 16:36:16 -0700
  • 3c90728e69 Merge pull request #442 from Atheros1/master Jonathan Warren 2013-08-25 16:36:16 -0700
  • 76544f73b5 Merge 4396bc7f97 into 84465c4e8e Jonathan Warren 2013-08-25 16:34:53 -0700
  • 8ba40c29b5
    manually undid much of pull #287. Discussion in #398 Jonathan Warren 2013-08-25 19:31:54 -0400
  • 4396bc7f97 manually undid much of pull #287. Discussion in #398 Jonathan Warren 2013-08-25 19:31:54 -0400
  • f27691ecb8
    Merge pull request #394 from DivineOmega/class_sqlThread_logger Jonathan Warren 2013-08-25 16:07:45 -0700
  • 84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger Jonathan Warren 2013-08-25 16:07:45 -0700
  • dd6bce14a5 Merge b44066e5f5 into eeddd7f2b5 Jordan Hall 2013-08-25 16:04:25 -0700
  • aa61bf206e
    Merge pull request #393 from erikackermann/patch-1 Jonathan Warren 2013-08-25 16:04:19 -0700
  • eeddd7f2b5 Merge pull request #393 from erikackermann/patch-1 Jonathan Warren 2013-08-25 16:04:19 -0700
  • ee02ecc5cb Merge 738c58694c into 1496177892 Erik Ackermann 2013-08-25 16:02:29 -0700
  • 67bcacea92
    Merge pull request #441 from Atheros1/master Jonathan Warren 2013-08-25 16:00:05 -0700
  • 1496177892 Merge pull request #441 from Atheros1/master Jonathan Warren 2013-08-25 16:00:05 -0700
  • 737d85eefa Merge 1b5158d658 into f317fafbb3 Jonathan Warren 2013-08-25 15:59:55 -0700
  • 7926b79a79
    refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable Jonathan Warren 2013-08-25 18:55:53 -0400
  • 1b5158d658 refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable Jonathan Warren 2013-08-25 18:55:53 -0400
  • d80866d70b
    Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-08-25 16:24:03 -0400
  • f317fafbb3 Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-08-25 16:24:03 -0400
  • e0ac318cfb
    resolve merge conflict Jonathan Warren 2013-08-25 16:23:28 -0400
  • ea54f8e779 resolve merge conflict Jonathan Warren 2013-08-25 16:23:28 -0400
  • 0686a37483
    Merge pull request #425 from rakoo/fix-archpackage Jonathan Warren 2013-08-25 13:15:06 -0700
  • a20cff425c Merge pull request #425 from rakoo/fix-archpackage Jonathan Warren 2013-08-25 13:15:06 -0700
  • f192a550a7 Merge bcff27ff7c into 2614975163 Matthieu Rakotojaona 2013-08-25 13:14:22 -0700
  • 9ba9571578
    Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-08-25 16:03:24 -0400
  • 2614975163 Merge branch 'master' of github.com:Bitmessage/PyBitmessage Jonathan Warren 2013-08-25 16:03:24 -0400
  • 8b387dd607
    Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error Jonathan Warren 2013-08-25 16:02:02 -0400
  • 7146823b10 Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error Jonathan Warren 2013-08-25 16:02:02 -0400
  • 13e7fee7fc
    Merge pull request #440 from Atheros1/master Jonathan Warren 2013-08-25 12:59:32 -0700
  • 0c2ce666c2 Merge pull request #440 from Atheros1/master Jonathan Warren 2013-08-25 12:59:32 -0700
  • da7301a833 Merge 4c920fd153 into 83f3d81251 Jonathan Warren 2013-08-25 12:59:20 -0700
  • ab0a401f5d
    resolve merge conflict Jonathan Warren 2013-08-25 15:56:20 -0400
  • 4c920fd153 resolve merge conflict Jonathan Warren 2013-08-25 15:56:20 -0400
  • ceb36ed643
    Merge pull request #439 from Atheros1/master Jonathan Warren 2013-08-25 11:11:18 -0700
  • 83f3d81251 Merge pull request #439 from Atheros1/master Jonathan Warren 2013-08-25 11:11:18 -0700
  • e0829f92be Merge 82db79ca39 into 9a4d7a7801 Jonathan Warren 2013-08-25 11:06:16 -0700
  • 7b3128b84b
    Removed sudo when building DMG Rob Speed 2013-08-25 04:43:32 -0400
  • f0ba10e2b9 Removed sudo when building DMG Rob Speed 2013-08-25 04:43:32 -0400
  • 19a4f3b53b
    Added Sip and PyQt to includes Rob Speed 2013-08-25 04:36:43 -0400
  • f0557e3987 Added Sip and PyQt to includes Rob Speed 2013-08-25 04:36:43 -0400
  • 471edbabbd Merge 854da95437 into 9a4d7a7801 akh81 2013-08-24 18:10:38 -0700
  • 854da95437 updated Russian translations + fixed .pro files for all languages akh81 2013-08-24 20:07:32 -0500
  • 24186f9169 updated Russian translations + fixed .pro files for all languages akh81 2013-08-24 19:58:00 -0500
  • f5f585973e
    removed option from previous commit which allowed user-settable maximum network message size pending further discussion Jonathan Warren 2013-08-24 20:23:49 -0400
  • 82db79ca39 removed option from previous commit which allowed user-settable maximum network message size pending further discussion Jonathan Warren 2013-08-24 20:23:49 -0400
  • f690b455d9
    resolve merge conflict Jonathan Warren 2013-08-24 20:18:46 -0400
  • a5c65f11e8 resolve merge conflict Jonathan Warren 2013-08-24 20:18:46 -0400
  • 7db597354c
    Merge pull request #435 from Atheros1/master Jonathan Warren 2013-08-24 16:48:57 -0700
  • 9a4d7a7801 Merge pull request #435 from Atheros1/master Jonathan Warren 2013-08-24 16:48:57 -0700
  • 37ca3084a6 Merge 0132db33dc into 28b6b743e3 Jonathan Warren 2013-08-24 16:48:33 -0700
  • 37d33ff37c
    show number of each message type processed in the API command clientStatus Jonathan Warren 2013-08-24 19:40:48 -0400
  • 0132db33dc show number of each message type processed in the API command clientStatus Jonathan Warren 2013-08-24 19:40:48 -0400
  • 774fa58716
    Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code). sendiulo 2013-08-24 09:21:59 +0200
  • a36c696f9d Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code). sendiulo 2013-08-24 09:21:59 +0200
  • 25850824a4
    Combobox for language selection. sendiulo 2013-08-24 09:07:46 +0200
  • da93d1d8b4 Combobox for language selection. sendiulo 2013-08-24 09:07:46 +0200
  • 6007a02251
    Actually OSX app maded with py2app can parallelize just fine Grant T. Olson 2013-08-23 16:10:57 -0400
  • bd489408c7 Actually OSX app maded with py2app can parallelize just fine Grant T. Olson 2013-08-23 16:10:57 -0400
  • 3a1c217500
    Use fast PoW unless we're explicitly a frozen (binary) version of the code Grant T. Olson 2013-08-23 13:20:07 -0400
  • a20213f1e8 Use fast PoW unless we're explicitly a frozen (binary) version of the code Grant T. Olson 2013-08-23 13:20:07 -0400
  • aac9db2efa Merge e65fc0eb4d into 28b6b743e3 Grant Olson 2013-08-22 09:49:33 -0700
  • e65fc0eb4d Even if we're on a platform that supports fast PoW calculation, we should use safe PoWs when we're only utilizing a single core Grant T. Olson 2013-08-22 12:45:24 -0400
  • 35ecf43a75 Merge f6b217b558 into 28b6b743e3 RemideZ 2013-08-22 09:25:52 -0700
  • f6b217b558 Update __init__.py RemideZ 2013-08-22 18:24:21 +0200
  • 12c60917d9
    Add listAddressbook to api Amos Bairn 2013-08-22 07:35:48 -0700
  • a290b61f1a Add listAddressbook to api Amos Bairn 2013-08-22 07:35:48 -0700