citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
789 Commits 3 Branches 0 Tags 13 MiB
0284a965f3
Commit Graph

789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Noble
c655b9a506 Add getInboxMessagesByAddress API command 2013-06-20 00:49:28 -04:00
Jordan Hall
96261b09bd Merge remote-tracking branch 'upsteam/master' 2013-06-20 00:14:18 +01: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
Jonathan Warren
23bfb0e304 Merge pull request #227 from pfista/master 
Remove duplicate import statement
 2013-06-19 14:48:01 -07:00
Michael Pfister
9ebf6c159f Removed duplicate import statement for threading 2013-06-19 16:42:30 -05:00
Jonathan Warren
a6704ac5dc Merge pull request #226 from Atheros1/master 
'Save message as...' option in Inbox
 2013-06-19 13:51:36 -07: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
8b08ba1801 Merge pull request #225 from Atheros1/master 
OS X Build script and 'add subscription from address book' option
 2013-06-19 10:16:58 -07: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
Jonathan Warren
c5074800f6 Merge pull request #224 from Atheros1/master 
Translation and other merge requests
 2013-06-19 07:55:24 -07: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
b8250ae04f Fixed indentation error. 2013-06-19 13:10:25 +01: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
Maran
1f622103ad Added OS X Build directories to ignore file 2013-06-15 21:08:41 +02:00
Maran
e3bb756ea3 Added OS X DS_Store files to git ignore 2013-06-15 21:07:22 +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