Commit Graph

  • b09fc6fd86 Merge pull request #253 from Atheros1/master Jonathan Warren 2013-06-24 20:24:50 -0700
  • 61ab0013aa added new variable: doTimingAttackMitigation Jonathan Warren 2013-06-24 17:29:15 -0400
  • 3204c6b833 added new variable: doTimingAttackMitigation Jonathan Warren 2013-06-24 17:29:04 -0400
  • acb8b51e00 sock.sendall errors need-not go to stderr Jonathan Warren 2013-06-24 17:00:35 -0400
  • 5a7d86cca9 Fix edge-case bug in possibleNewPubkey function Jonathan Warren 2013-06-24 16:57:19 -0400
  • dacd9aa925 Add strftime import Jonathan Warren 2013-06-24 16:25:31 -0400
  • 436fced04b neededPubkeys data structure now in shared module Jonathan Warren 2013-06-24 16:18:18 -0400
  • c857f73d0b Continued moving code into individual modules Jonathan Warren 2013-06-24 15:51:01 -0400
  • c3ea67ed05 Changed headings of list of connections per stream so that it fits visually DivineOmega 2013-06-24 13:56:30 +0100
  • cc304b4e8b spelling Delia Eris 2013-06-23 21:49:18 -0500
  • 9925d55df2 Removed unused imports from bitmessagemain Jordan Hall 2013-06-23 21:30:16 +0100
  • 01e20177bc Adding src/.settings/ to .gitignore (for Eclipse developers) Jordan Hall 2013-06-23 21:17:34 +0100
  • fa7932974d Updated gitignore for pydev development Jordan Hall 2013-06-23 20:53:14 +0100
  • 2eb6558cf1 Added a number of missing imports fixing several issues (thank you PyDev) Jordan Hall 2013-06-23 20:52:39 +0100
  • e9dc2d5c5e Fixed missing hashlib import in class_sendDataThread Jordan Hall 2013-06-23 19:31:47 +0100
  • 3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain Jordan Hall 2013-06-23 19:13:07 +0100
  • 07efdca3a6 Merge pull request #249 from Atheros1/master Jonathan Warren 2013-06-22 23:40:53 -0700
  • f1d2b042ea add import sys to class_sqlThread.py Jonathan Warren 2013-06-23 02:38:21 -0400
  • b04baf0b4e Merge pull request #247 from Atheros1/master Jonathan Warren 2013-06-22 07:57:19 -0700
  • c2f493b595 Fix issue #246 Jonathan Warren 2013-06-22 10:55:15 -0400
  • 37886916b8 Add getSentMessagesByAddress API command Joshua Noble 2013-06-22 02:21:24 -0400
  • fe8998ca3a Seperating out all peer networking classes and merging with upstream Jordan Hall 2013-06-22 00:49:50 +0100
  • 27a8662f22 Seperating class_singleListener, class_receiveDataThread, class_sendDataThread Jordan Hall 2013-06-21 23:29:04 +0100
  • a57d9565c9 Merge pull request #242 from Atheros1/master Jonathan Warren 2013-06-21 15:16:00 -0700
  • c7d9b316ef Seperated out class_singleWorker (POW thread) Jordan Hall 2013-06-21 22:32:22 +0100
  • 85ea62d678 Added icns with transparency Jaxkr 2013-06-21 14:13:59 -0600
  • 32aaaf2023 Fix bugs in githup pull request #238 Jonathan Warren 2013-06-21 15:44:28 -0400
  • af9dbda5d3 Fixed capitalization of Application Support, which causes problems for people with a case sensitive OS X file system Jaxkr 2013-06-21 12:26:33 -0600
  • d2d2d8c380 Fixed translate functions not being found as they were being defined after the QT GUI was started DivineOmega 2013-06-21 16:24:04 +0100
  • c2cfff2a2e Reworked translate function to be more accommodating DivineOmega 2013-06-21 13:55:09 +0100
  • e7fffe7ecd Seperated out class_addressGenerator - not perfectly DivineOmega 2013-06-21 13:44:37 +0100
  • 0b258be363 Fixed missing arithmetic import in helper_bitcoin file DivineOmega 2013-06-21 12:58:36 +0100
  • 8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files DivineOmega 2013-06-21 10:10:13 +0100
  • 894de2da34 Changed received to receivedTime Joshua Noble 2013-06-21 00:55:24 -0400
  • b64bbda82a Added folder to select statement for getInboxMessagesByAddress Joshua Noble 2013-06-21 00:54:11 -0400
  • 138877f5f7 Placed repeated inbox and sent SQL operations into appropriate helper functions Jordan Hall 2013-06-21 00:25:01 +0100
  • 423e83d77c Split off some bootstrap and startup helper functions into their own files Jordan Hall 2013-06-20 23:55:04 +0100
  • 181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain Jordan Hall 2013-06-20 22:23:12 +0100
  • ebc62b9edc Moving certain classes outside of bitmessagemain.py Jordan Hall 2013-06-20 22:23:03 +0100
  • 958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes Jonathan Warren 2013-06-20 13:47:28 -0700
  • 7f1d8cb0d2 Merge pull request #237 from Atheros1/master Jonathan Warren 2013-06-20 13:42:52 -0700
  • 936369da0a manual implement Github issue #223 Jonathan Warren 2013-06-20 16:41:14 -0400
  • a6c9ff288e manuall merge github issue #229 Jonathan Warren 2013-06-20 16:04:50 -0400
  • 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
  • b2f8a76b58 Merge pull request #231 from Atheros1/master Jonathan Warren 2013-06-20 05:00:16 -0700
  • 58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table Jonathan Warren 2013-06-20 07:58:37 -0400
  • 29c5282d48 manual merge acejam-master Jonathan Warren 2013-06-20 07:52:39 -0400
  • 76f851b7a2 manual merge acejam-master Jonathan Warren 2013-06-20 07:51:02 -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
  • 8addc44570 Merge pull request #222 from DivineOmega/master Jonathan Warren 2013-06-20 04:27:20 -0700
  • c655b9a506 Add getInboxMessagesByAddress API command Joshua Noble 2013-06-20 00:49:28 -0400
  • d00cbe3a50 Merge remote-tracking branch 'upstream/master': new changes and merged features nimda 2013-06-19 20:55:52 -0400
  • 96261b09bd Merge remote-tracking branch 'upsteam/master' Jordan Hall 2013-06-20 00:14:18 +0100
  • 4aa0207727 Merging with upstream and resolving conflicts Jordan Hall 2013-06-19 23:11:35 +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
  • 7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands Jordan Hall 2013-06-19 22:50:00 +0100
  • 23bfb0e304 Merge pull request #227 from pfista/master Jonathan Warren 2013-06-19 14:48:01 -0700
  • 9ebf6c159f Removed duplicate import statement for threading Michael Pfister 2013-06-19 16:42:30 -0500
  • a6704ac5dc Merge pull request #226 from Atheros1/master Jonathan Warren 2013-06-19 13:51:36 -0700
  • 930a12fec7 manual merge, also be careful of international characters Jonathan Warren 2013-06-19 16:49:31 -0400
  • 5dcfa962dd Added clientStatus API call Jonathan Warren 2013-06-19 15:33:42 -0400
  • 8b08ba1801 Merge pull request #225 from Atheros1/master Jonathan Warren 2013-06-19 10:16:58 -0700
  • 69267fb6fe Fix issue #212 to support international characters Jonathan Warren 2013-06-19 13:10:43 -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
  • 5aedc385b8 Manual merge github issue #212 Jonathan Warren 2013-06-19 12:19:07 -0400
  • c5074800f6 Merge pull request #224 from Atheros1/master Jonathan Warren 2013-06-19 07:55:24 -0700
  • 28ed9676cc Fixed indentation error (previous commit contained no files) jordan@hall05.co.uk 2013-06-19 12:29:28 +0000
  • b8250ae04f Fixed indentation error. jordan@hall05.co.uk 2013-06-19 13:10:25 +0100
  • 3f07f895bc Added 'getAllInboxMessages' command to API. jordan@hall05.co.uk 2013-06-19 12:06:46 +0000
  • ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command. jordan@hall05.co.uk 2013-06-19 12:02:52 +0000
  • fba402ab18 Added 'getSentMessageById' command to API jordan@hall05.co.uk 2013-06-19 11:57:41 +0000
  • d79d002dd3 Added 'getAllSentMessages' command to API jordan@hall05.co.uk 2013-06-19 09:46:55 +0000
  • 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
  • aeeb7c9878 Moved UI related files all into the bitmessageqt folder Jonathan Warren 2013-06-18 13:59:51 -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
  • 461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master Jonathan Warren 2013-06-18 13:12:49 -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
  • 9ff2c9568f adjust code formatting Jonathan Warren 2013-06-18 12:56:03 -0400
  • 952524f7d5 Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master Jonathan Warren 2013-06-18 12:45:55 -0400
  • 4f8742655d update defaultKnownNodes Jonathan Warren 2013-06-18 12:37:13 -0400
  • 0b602f0f8c Added more translatable strings Jonathan Warren 2013-06-18 11:30:42 -0400
  • fa91d31f42 adjust translation-related code Jonathan Warren 2013-06-17 17:49:06 -0400
  • 48b5e26e46 Finished adjusted _translate function to work under daemon mode Jonathan Warren 2013-06-17 16:42:30 -0400
  • 86f186d9b3 Merge remote-tracking branch 'upstream/master' nimda 2013-06-16 20:55:28 -0400
  • 5a10d997f9 tabs? nimda 2013-06-16 18:38:27 -0400
  • 3865d3cb9f 'Save message as...' option in Inbox nimda 2013-06-16 18:28:18 -0400
  • 5e66e81ab7 Make sure libcrypto from brew is linked. In the resulting .app Maran 2013-06-17 00:25:03 +0200
  • 3475000902 Added OS X Build scripts Maran 2013-06-15 21:09:15 +0200
  • 1f622103ad Added OS X Build directories to ignore file Maran 2013-06-15 21:08:41 +0200
  • e3bb756ea3 Added OS X DS_Store files to git ignore Maran 2013-06-15 21:07:22 +0200
  • 5938efca1a Manual merge and fix Github issue #213 Jonathan Warren 2013-06-14 15:58:46 -0400
  • fd3f1f8ebf fixed typo ack-arg for translation Gatien Bovyn 2013-06-14 13:27:55 +0200
  • 0343c67b95 applied Atheros1 commit for error handling around .encrypt Gatien Bovyn 2013-06-14 13:20:38 +0200
  • cad151a440 strings comparaison failed with translation: fixed Gatien Bovyn 2013-06-14 12:47:46 +0200
  • 8acd7669e4 This grammar bothered me. nimda 2013-06-13 23:04:11 -0400
  • e6beeedea1 str() for luck nimda 2013-06-13 22:28:33 -0400
  • e7378cffcc actually add status bar message. nimda 2013-06-13 22:27:52 -0400
  • f264c22ffb actually fix SQL error, add status bar message. nimda 2013-06-13 22:27:14 -0400
  • 06ca8625f5 try to fix SQL error nimda 2013-06-13 22:16:37 -0400
  • 3539160bd4 I can't believe I forgot that bracket. nimda 2013-06-13 22:07:19 -0400