Jordan Hall
|
3f0283eaaf
|
Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
|
10 years ago |
Jonathan Warren
|
07efdca3a6
|
Merge pull request #249 from Atheros1/master
add import sys to class_sqlThread.py
|
10 years ago |
|
Jonathan Warren
|
f1d2b042ea
|
add import sys to class_sqlThread.py
|
10 years ago |
|
Jonathan Warren
|
b04baf0b4e
|
Merge pull request #247 from Atheros1/master
Fix issue #246
|
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 |
|
Jonathan Warren
|
a57d9565c9
|
Merge pull request #242 from Atheros1/master
Modularize PyBitmessage into multiple files
|
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
|
0b258be363
|
Fixed missing arithmetic import in helper_bitcoin file
|
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
New API command getSentMessageByAckData and made other commands return ackData
|
10 years ago |
|
Jonathan Warren
|
7f1d8cb0d2
|
Merge pull request #237 from Atheros1/master
manually merge pull requests
|
10 years ago |
|
Jonathan Warren
|
936369da0a
|
manual implement Github issue #223
|
10 years ago |
|
Jonathan Warren
|
a6c9ff288e
|
manuall merge github issue #229
|
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
|
b2f8a76b58
|
Merge pull request #231 from Atheros1/master
getInboxMessagesByAddress use actual encoding type
|
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 |
|
Jonathan Warren
|
0179fa0e4c
|
Merge branch 'api_improvements' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-api_improvements
|
10 years ago |
|
Jonathan Warren
|
8addc44570
|
Merge pull request #222 from DivineOmega/master
Added 'getAllSentMessages' command to API
|
10 years ago |
Joshua Noble
|
c655b9a506
|
Add getInboxMessagesByAddress API command
|
10 years ago |
|
Jordan Hall
|
96261b09bd
|
Merge remote-tracking branch 'upsteam/master'
|
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 |
|
Jonathan Warren
|
23bfb0e304
|
Merge pull request #227 from pfista/master
Remove duplicate import statement
|
10 years ago |
Michael Pfister
|
9ebf6c159f
|
Removed duplicate import statement for threading
|
10 years ago |
|
Jonathan Warren
|
a6704ac5dc
|
Merge pull request #226 from Atheros1/master
'Save message as...' option in Inbox
|
10 years ago |
|
Jonathan Warren
|
930a12fec7
|
manual merge, also be careful of international characters
|
10 years ago |
|
Jonathan Warren
|
5dcfa962dd
|
Added clientStatus API call
|
10 years ago |
|
Jonathan Warren
|
8b08ba1801
|
Merge pull request #225 from Atheros1/master
OS X Build script and 'add subscription from address book' option
|
10 years ago |
|
Jonathan Warren
|
69267fb6fe
|
Fix issue #212 to support international characters
|
10 years ago |
|
Jonathan Warren
|
c3f24f1088
|
Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild
|
10 years ago |
|
Jonathan Warren
|
5aedc385b8
|
Manual merge github issue #212
|
10 years ago |
|
Jonathan Warren
|
c5074800f6
|
Merge pull request #224 from Atheros1/master
Translation and other merge requests
|
10 years ago |
|
jordan@hall05.co.uk
|
28ed9676cc
|
Fixed indentation error (previous commit contained no files)
|
10 years ago |
|
jordan@hall05.co.uk
|
b8250ae04f
|
Fixed indentation error.
|
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 |