citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
720 Commits 3 Branches 0 Tags 36 MiB
Commit Graph

311 Commits

Author SHA1 Message Date
Jonathan Warren 1b13b74dbd Merge pull request #251 from deliaeris/patch-1 
spelling
 2013-06-24 20:57:48 -07:00
Jonathan Warren c4d09693d5 Merge pull request #240 from acejam/master 
Added folder to select statement & changed received to receivedTime
 2013-06-24 20:56:58 -07:00
Jonathan Warren 5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren 61ab0013aa added new variable: doTimingAttackMitigation 2013-06-24 17:29:15 -04:00
Jonathan Warren 3204c6b833 added new variable: doTimingAttackMitigation 2013-06-24 17:29:04 -04:00
Jonathan Warren acb8b51e00 sock.sendall errors need-not go to stderr 2013-06-24 17:00:35 -04:00
Jonathan Warren 5a7d86cca9 Fix edge-case bug in possibleNewPubkey function 2013-06-24 16:57:19 -04:00
Jonathan Warren dacd9aa925 Add strftime import 2013-06-24 16:25:31 -04:00
Jonathan Warren 436fced04b neededPubkeys data structure now in shared module 2013-06-24 16:18:18 -04:00
Jonathan Warren c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
DivineOmega c3ea67ed05 Changed headings of list of connections per stream so that it fits visually 2013-06-24 13:56:30 +01:00
Delia Eris cc304b4e8b spelling 
implimented -> implemented
 2013-06-23 21:49:18 -05:00
Jordan Hall 9925d55df2 Removed unused imports from bitmessagemain 2013-06-23 21:30:16 +01:00
Jordan Hall 2eb6558cf1 Added a number of missing imports fixing several issues (thank you PyDev) 2013-06-23 20:52:39 +01:00
Jordan Hall e9dc2d5c5e Fixed missing hashlib import in class_sendDataThread 2013-06-23 19:31:47 +01:00
Jordan Hall 3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain 2013-06-23 19:13:07 +01:00
Jonathan Warren f1d2b042ea add import sys to class_sqlThread.py 2013-06-23 02:38:21 -04:00
Jonathan Warren c2f493b595 Fix issue #246 2013-06-22 10:55:15 -04:00
Joshua Noble 37886916b8 Add getSentMessagesByAddress API command 2013-06-22 02:21:24 -04:00
Jordan Hall fe8998ca3a Seperating out all peer networking classes and merging with upstream 2013-06-22 00:49:50 +01:00
Jordan Hall 27a8662f22 Seperating class_singleListener, class_receiveDataThread, class_sendDataThread 2013-06-21 23:29:04 +01:00
Jordan Hall c7d9b316ef Seperated out class_singleWorker (POW thread) 2013-06-21 22:32:22 +01:00
Jaxkr 85ea62d678 Added icns with transparency 2013-06-21 14:13:59 -06:00
Jonathan Warren 32aaaf2023 Fix bugs in githup pull request #238 2013-06-21 15:44:28 -04:00
Jaxkr af9dbda5d3 Fixed capitalization of Application Support, which causes problems for people with a case sensitive OS X file system 2013-06-21 12:26:33 -06:00
DivineOmega d2d2d8c380 Fixed translate functions not being found as they were being defined after the QT GUI was started 2013-06-21 16:24:04 +01:00
DivineOmega c2cfff2a2e Reworked translate function to be more accommodating 2013-06-21 13:55:09 +01:00
DivineOmega e7fffe7ecd Seperated out class_addressGenerator - not perfectly 2013-06-21 13:44:37 +01:00
DivineOmega 0b258be363 Fixed missing arithmetic import in helper_bitcoin file 2013-06-21 12:58:36 +01:00
DivineOmega 8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files 2013-06-21 10:10:13 +01:00
Joshua Noble 894de2da34 Changed received to receivedTime 2013-06-21 00:55:24 -04:00
Joshua Noble b64bbda82a Added folder to select statement for getInboxMessagesByAddress 2013-06-21 00:54:11 -04:00
Jordan Hall 138877f5f7 Placed repeated inbox and sent SQL operations into appropriate helper functions 2013-06-21 00:25:01 +01:00
Jordan Hall 423e83d77c Split off some bootstrap and startup helper functions into their own files 2013-06-20 23:55:04 +01:00
Jordan Hall 181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain 2013-06-20 22:23:12 +01:00
Jordan Hall ebc62b9edc Moving certain classes outside of bitmessagemain.py 2013-06-20 22:23:03 +01:00
Jonathan Warren 958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes 
New API command getSentMessageByAckData and made other commands return ackData
 2013-06-20 13:47:28 -07:00
Jonathan Warren 936369da0a manual implement Github issue #223 2013-06-20 16:41:14 -04:00
Jonathan Warren a6c9ff288e manuall merge github issue #229 2013-06-20 16:04:50 -04:00
jordan@hall05.co.uk e49e9a60b0 New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData 2013-06-20 13:04:34 +00:00
Jonathan Warren 58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table 2013-06-20 07:58:37 -04:00
Jonathan Warren 29c5282d48 manual merge acejam-master 2013-06-20 07:52:39 -04:00
Jonathan Warren 76f851b7a2 manual merge acejam-master 2013-06-20 07:51:02 -04:00
Joshua Noble c655b9a506 Add getInboxMessagesByAddress API command 2013-06-20 00:49:28 -04:00
Jordan Hall 4aa0207727 Merging with upstream and resolving conflicts 2013-06-19 23:11:35 +01:00
Jordan Hall 21ec1de7ca Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces. 2013-06-19 23:02:36 +01:00
Jordan Hall 7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands 2013-06-19 22:50:00 +01:00
Michael Pfister 9ebf6c159f Removed duplicate import statement for threading 2013-06-19 16:42:30 -05:00
Jonathan Warren 930a12fec7 manual merge, also be careful of international characters 2013-06-19 16:49:31 -04:00
Jonathan Warren 5dcfa962dd Added clientStatus API call 2013-06-19 15:33:42 -04:00
Jonathan Warren 69267fb6fe Fix issue #212 to support international characters 2013-06-19 13:10:43 -04:00
Jonathan Warren c3f24f1088 Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild 2013-06-19 12:44:22 -04:00
Jonathan Warren 5aedc385b8 Manual merge github issue #212 2013-06-19 12:19:07 -04:00
jordan@hall05.co.uk 28ed9676cc Fixed indentation error (previous commit contained no files) 2013-06-19 12:29:28 +00:00
jordan@hall05.co.uk 3f07f895bc Added 'getAllInboxMessages' command to API. 2013-06-19 12:06:46 +00:00
jordan@hall05.co.uk ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command. 2013-06-19 12:02:52 +00:00
jordan@hall05.co.uk fba402ab18 Added 'getSentMessageById' command to API 2013-06-19 11:57:41 +00:00
jordan@hall05.co.uk d79d002dd3 Added 'getAllSentMessages' command to API 2013-06-19 09:46:55 +00:00
Jonathan Warren 9d7a869cb9 Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW 2013-06-19 00:51:31 -04:00
Jonathan Warren aeeb7c9878 Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
Jonathan Warren 28f9144113 When using API, start giving user actual message encoding type now that the inbox table actually tracks it 2013-06-18 13:24:35 -04:00
Jonathan Warren 461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master 2013-06-18 13:12:49 -04:00
Jonathan Warren da0f486179 manually merge github pull request: Unicode chars in localtime prevented the gui from starting 2013-06-18 13:11:30 -04:00
Jonathan Warren 9ff2c9568f adjust code formatting 2013-06-18 12:56:03 -04:00
Jonathan Warren 952524f7d5 Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master 2013-06-18 12:45:55 -04:00
Jonathan Warren 4f8742655d update defaultKnownNodes 2013-06-18 12:37:13 -04:00
Jonathan Warren 0b602f0f8c Added more translatable strings 2013-06-18 11:30:42 -04:00
Jonathan Warren fa91d31f42 adjust translation-related code 2013-06-17 17:49:06 -04:00
Jonathan Warren 48b5e26e46 Finished adjusted _translate function to work under daemon mode 2013-06-17 16:42:30 -04:00
nimda 5a10d997f9 tabs? 2013-06-16 18:38:27 -04:00
nimda 3865d3cb9f 'Save message as...' option in Inbox 2013-06-16 18:28:18 -04:00
Maran 5e66e81ab7 Make sure libcrypto from brew is linked. In the resulting .app 2013-06-17 00:25:03 +02:00
Maran 3475000902 Added OS X Build scripts 2013-06-15 21:09:15 +02:00
Jonathan Warren 5938efca1a Manual merge and fix Github issue #213 2013-06-14 15:58:46 -04:00
Gatien Bovyn fd3f1f8ebf fixed typo ack-arg for translation 2013-06-14 13:27:55 +02:00
Gatien Bovyn 0343c67b95 applied Atheros1 commit for error handling around .encrypt 
commit 8d7eceb18e
 2013-06-14 13:20:38 +02:00
Gatien Bovyn cad151a440 strings comparaison failed with translation: fixed 2013-06-14 12:47:46 +02:00
nimda 8acd7669e4 This grammar bothered me. 2013-06-13 23:04:11 -04:00
nimda e6beeedea1 str() for luck 2013-06-13 22:28:33 -04:00
nimda e7378cffcc actually add status bar message. 2013-06-13 22:27:52 -04:00
nimda f264c22ffb actually fix SQL error, add status bar message. 2013-06-13 22:27:14 -04:00
nimda 06ca8625f5 try to fix SQL error 2013-06-13 22:16:37 -04:00
nimda 3539160bd4 I can't believe I forgot that bracket. 2013-06-13 22:07:19 -04:00
nimda 5b6a3d419e cleanup 2013-06-13 22:03:03 -04:00
nimda 98aacd16ff Subscribe to an address in the addressbook 2013-06-13 21:55:38 -04:00
Joshua Noble a8693156b0 Add getInboxMessageById API command 2013-06-13 20:48:55 -04:00
Gatien Bovyn b7f99a10d2 corrected an string comparaison, naturally failed in french 2013-06-13 23:52:24 +02:00
Gatien Bovyn 7fb20468a8 trying to resolve _translate undefined 2013-06-13 23:42:32 +02:00
Gatien Bovyn 8db60e788c translation updated 2013-06-13 23:16:11 +02:00
Gatien Bovyn 71e30e1a65 translation updated 2013-06-13 23:14:03 +02:00
Gatien Bovyn 574f4d5c3e new translatable strings found + french translation updated 2013-06-13 21:39:24 +02:00
Jonathan Warren 8d7eceb18e Add error handling around .encrypt 2013-06-13 15:15:22 -04:00
Gatien Bovyn 930159303c fixed typo + translations updated 2013-06-13 20:59:37 +02:00
Gatien Bovyn 1f10b2d50c new translatable string in bitmessagemain 2013-06-13 20:57:35 +02:00
Gatien Bovyn 45ac908b1e update french translation 2013-06-13 20:22:59 +02:00
Gatien Bovyn 0bfb6c4590 2 new translatable strings in bitmessagemain 2013-06-13 20:21:10 +02:00
Gatien Bovyn dbc5abbe19 new string find to be translated in bitmessagemain + fixed english typo in GUI 2013-06-13 20:16:48 +02:00
Gatien Bovyn 63744bfb27 autopep8 bitmessagemain.py file + fixed typo 2013-06-13 20:00:56 +02:00
Gatien Bovyn 04c3857c68 updated icons file 
pyrcc4 bitmessage_icons.qrc -o bitmessage_icons_rc.py
 2013-06-13 10:48:16 +02:00
Gatien Bovyn 242981755f fixed "libpng warning: iCCP: known incorrect sRGB profile" error 
=== before ===
(find . -iname '*.png' -type f -exec identify -verbose '{}' +) |& grep 'known incorrect sRGB profile'
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-green.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./greenicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-yellow.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./redicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-red.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-16px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./yellowicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
 2013-06-13 10:30:30 +02:00