Bitmessage/PyBitmessage-2024-12-05
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity
2,060 Commits 82 Branches 25 Tags 470 MiB
805f72e098
Commit Graph

2060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7f1d8cb0d2 Merge pull request #237 from Atheros1/master 
manually merge pull requests
 2013-06-20 13:42:52 -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
b2f8a76b58 Merge pull request #231 from Atheros1/master 
getInboxMessagesByAddress use actual encoding type
 2013-06-20 05:00:16 -07: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
Jonathan Warren
0179fa0e4c Merge branch 'api_improvements' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-api_improvements 2013-06-20 07:38:03 -04:00
Jonathan Warren
8addc44570 Merge pull request #222 from DivineOmega/master 
Added 'getAllSentMessages' command to API
 2013-06-20 04:27:20 -07:00
Joshua Noble
c655b9a506 Add getInboxMessagesByAddress API command 2013-06-20 00:49:28 -04:00
nimda
d00cbe3a50 Merge remote-tracking branch 'upstream/master': new changes and merged features 2013-06-19 20:55:52 -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