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

274 Commits

Author SHA1 Message Date
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
Gatien Bovyn c7358bdb84 function _translate - lighter code 
replace QtGui.QApplication.translate with _translate
 2013-06-13 09:59:40 +02:00
Gatien Bovyn 11334a0cdf fixed french typo 2013-06-13 08:53:16 +02:00
Gatien Bovyn 1540e99f6d fixed french typo 2013-06-13 08:48:03 +02:00
Gatien Bovyn ce638ae076 fixed typo + translation file 2013-06-13 08:43:59 +02:00
Gatien Bovyn eba8bbe55c fixed typo in GUI 2013-06-13 01:21:40 +02:00
Gatien Bovyn 7f97a27e8a fixed typo in translation file 2013-06-13 01:19:57 +02:00
Gatien Bovyn cbf160a8d9 fixed typos + translation files 2013-06-13 01:11:01 +02:00
Gatien Bovyn da7332ae5b fixed typo + translation files 2013-06-13 00:57:46 +02:00
Gatien Bovyn 4f3b6751b3 launched autopep8 --in-place --recursive --jobs=0 -aaaaa __init__.py 2013-06-12 23:12:32 +02:00
Jonathan Warren faa643b73f Merge pull request #203 from razzintown/master 
Typo: "exist" to "exit"
 2013-06-12 10:32:13 -07:00
Gatien Bovyn a5dd8c9187 updated translation files 2013-06-12 16:50:17 +02:00
Gatien Bovyn 69b2468ed7 updated translation files 2013-06-12 16:42:03 +02:00
Gatien Bovyn a5d7088c5c updated translation files 2013-06-12 15:29:09 +02:00
Gatien Bovyn 9062942eb2 updated translation 2013-06-12 14:22:04 +02:00
Gatien Bovyn fd4a396be1 update translatable strings 2013-06-12 13:36:24 +02:00
Gatien Bovyn 371898bc24 modified to work in translations/ 2013-06-12 10:46:01 +02:00
Gatien Bovyn b73ae3edfc translation file needed by Qt4 2013-06-12 10:31:29 +02:00
Gatien Bovyn da09198246 translation of bitmessage in french 2013-06-12 10:29:48 +02:00
Gatien Bovyn 823847609e .pro file that indicate which files to translate 2013-06-12 10:26:43 +02:00
Gatien Bovyn bac378283e moved to translations/ 2013-06-12 10:22:43 +02:00
Gatien Bovyn d18875cf5f .pro file to indicate what needs to be translated 2013-06-12 10:18:34 +02:00
Gatien Bovyn ab46d4ef3a modify string so they can be translated 2013-06-12 10:15:56 +02:00
Gatien Bovyn 7c96ef5b6c load QTranslator and get locale 2013-06-12 10:07:04 +02:00
Gatien Bovyn 7dd57d6181 import locale for localisation 2013-06-12 10:05:20 +02:00
Jonathan Warren 087d1b8c68 Continued Max acceptable difficulty programming and testing 2013-06-11 14:15:17 -04:00
Jonathan Warren ee0c0f8c9b Continued Max acceptable difficulty programming and testing 2013-06-11 02:33:48 -04:00
Jonathan Warren 999e6e6ccd Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-06-10 23:43:11 -04:00
Jonathan Warren 7f19ac82d0 Check to see whether we are awaiting a new pubkey within the receiveData thread not the workerThread 2013-06-10 23:43:06 -04:00
Razz Fox 6afd7e46d4 Typo: "exist" to "exit" 2013-06-10 15:54:23 -07:00
Jonathan Warren 179723bbf8 Continued Max acceptable difficulty programming and testing 2013-06-10 18:53:15 -04:00
Jonathan Warren 7b508884e3 some initial work completed on MaxAcceptableDifficulty checking 2013-06-10 09:40:51 -04:00
Jonathan Warren e3927acb80 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:50:39 -04:00
Jonathan Warren 127ad53685 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:44:30 -04:00
Jonathan Warren e25f08b9ed Correct ECDSA verify 2013-06-07 18:58:28 -04:00
Jonathan Warren e7f972ca66 Correct ECDSA verify 2013-06-07 15:06:53 -04:00
Arceliar 30d829d0d4 Wait for PoW processes to exit before returning a result. Hopefully not needed. 2013-06-06 19:30:57 +02:00
Arceliar 4aca81e21f Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-06-06 18:57:30 +02:00