Commit Graph

130 Commits

Author SHA1 Message Date
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
8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files 2013-06-21 10:10:13 +01: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
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
5dcfa962dd Added clientStatus API call 2013-06-19 15:33:42 -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
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
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
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
Joshua Noble
a8693156b0 Add getInboxMessageById API command 2013-06-13 20:48:55 -04:00
Gatien Bovyn
7fb20468a8 trying to resolve _translate undefined 2013-06-13 23:42:32 +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
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
cbf160a8d9 fixed typos + translation files 2013-06-13 01:11:01 +02:00
Jonathan Warren
faa643b73f Merge pull request #203 from razzintown/master
Typo: "exist" to "exit"
2013-06-12 10:32:13 -07: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