Commit Graph

137 Commits (3f0283eaaf8ee117510492361f6ba31a49036bf4)

Author SHA1 Message Date
Jordan Hall 3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
10 years ago
Jonathan Warren c2f493b595 Fix issue #246
10 years ago
Jordan Hall fe8998ca3a Seperating out all peer networking classes and merging with upstream
10 years ago
Jordan Hall 27a8662f22 Seperating class_singleListener, class_receiveDataThread, class_sendDataThread
10 years ago
Jordan Hall c7d9b316ef Seperated out class_singleWorker (POW thread)
10 years ago
Jonathan Warren 32aaaf2023 Fix bugs in githup pull request #238
10 years ago
DivineOmega d2d2d8c380 Fixed translate functions not being found as they were being defined after the QT GUI was started
10 years ago
DivineOmega c2cfff2a2e Reworked translate function to be more accommodating
10 years ago
DivineOmega e7fffe7ecd Seperated out class_addressGenerator - not perfectly
10 years ago
DivineOmega 8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files
10 years ago
Jordan Hall 138877f5f7 Placed repeated inbox and sent SQL operations into appropriate helper functions
10 years ago
Jordan Hall 423e83d77c Split off some bootstrap and startup helper functions into their own files
10 years ago
Jordan Hall 181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain
10 years ago
Jordan Hall ebc62b9edc Moving certain classes outside of bitmessagemain.py
10 years ago
Jonathan Warren 958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes
10 years ago
Jonathan Warren 936369da0a manual implement Github issue #223
10 years ago
jordan@hall05.co.uk e49e9a60b0 New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData
10 years ago
Jonathan Warren 58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table
10 years ago
Jonathan Warren 29c5282d48 manual merge acejam-master
10 years ago
Jonathan Warren 76f851b7a2 manual merge acejam-master
10 years ago
Joshua Noble c655b9a506 Add getInboxMessagesByAddress API command
10 years ago
Jordan Hall 4aa0207727 Merging with upstream and resolving conflicts
10 years ago
Jordan Hall 21ec1de7ca Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces.
10 years ago
Jordan Hall 7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands
10 years ago
Michael Pfister 9ebf6c159f Removed duplicate import statement for threading
10 years ago
Jonathan Warren 5dcfa962dd Added clientStatus API call
10 years ago
jordan@hall05.co.uk 28ed9676cc Fixed indentation error (previous commit contained no files)
10 years ago
jordan@hall05.co.uk 3f07f895bc Added 'getAllInboxMessages' command to API.
10 years ago
jordan@hall05.co.uk ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command.
10 years ago
jordan@hall05.co.uk fba402ab18 Added 'getSentMessageById' command to API
10 years ago
jordan@hall05.co.uk d79d002dd3 Added 'getAllSentMessages' command to API
10 years ago
Jonathan Warren aeeb7c9878 Moved UI related files all into the bitmessageqt folder
10 years ago
Jonathan Warren 28f9144113 When using API, start giving user actual message encoding type now that the inbox table actually tracks it
10 years ago
Jonathan Warren 461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master
10 years ago
Jonathan Warren 0b602f0f8c Added more translatable strings
10 years ago
Jonathan Warren fa91d31f42 adjust translation-related code
10 years ago
Jonathan Warren 48b5e26e46 Finished adjusted _translate function to work under daemon mode
10 years ago
Jonathan Warren 5938efca1a Manual merge and fix Github issue #213
10 years ago
Gatien Bovyn fd3f1f8ebf fixed typo ack-arg for translation
10 years ago
Gatien Bovyn 0343c67b95 applied Atheros1 commit for error handling around .encrypt
10 years ago
Joshua Noble a8693156b0 Add getInboxMessageById API command
10 years ago
Gatien Bovyn 7fb20468a8 trying to resolve _translate undefined
10 years ago
Gatien Bovyn 574f4d5c3e new translatable strings found + french translation updated
10 years ago
Jonathan Warren 8d7eceb18e Add error handling around .encrypt
10 years ago
Gatien Bovyn 930159303c fixed typo + translations updated
10 years ago
Gatien Bovyn 1f10b2d50c new translatable string in bitmessagemain
10 years ago
Gatien Bovyn 0bfb6c4590 2 new translatable strings in bitmessagemain
10 years ago
Gatien Bovyn dbc5abbe19 new string find to be translated in bitmessagemain + fixed english typo in GUI
10 years ago
Gatien Bovyn 63744bfb27 autopep8 bitmessagemain.py file + fixed typo
10 years ago
Gatien Bovyn cbf160a8d9 fixed typos + translation files
10 years ago