Jordan Hall
|
3f0283eaaf
|
Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
|
2013-06-23 19:13:07 +01:00 |
|
Jonathan Warren
|
07efdca3a6
|
Merge pull request #249 from Atheros1/master
add import sys to class_sqlThread.py
|
2013-06-22 23:40:53 -07:00 |
|
Jonathan Warren
|
f1d2b042ea
|
add import sys to class_sqlThread.py
|
2013-06-23 02:38:21 -04:00 |
|
Jonathan Warren
|
b04baf0b4e
|
Merge pull request #247 from Atheros1/master
Fix issue #246
|
2013-06-22 07:57:19 -07:00 |
|
Jonathan Warren
|
c2f493b595
|
Fix issue #246
|
2013-06-22 10:55:15 -04:00 |
|
Joshua Noble
|
37886916b8
|
Add getSentMessagesByAddress API command
|
2013-06-22 02:21:24 -04:00 |
|
Jordan Hall
|
fe8998ca3a
|
Seperating out all peer networking classes and merging with upstream
|
2013-06-22 00:49:50 +01:00 |
|
Jordan Hall
|
27a8662f22
|
Seperating class_singleListener, class_receiveDataThread, class_sendDataThread
|
2013-06-21 23:29:04 +01:00 |
|
Jonathan Warren
|
a57d9565c9
|
Merge pull request #242 from Atheros1/master
Modularize PyBitmessage into multiple files
|
2013-06-21 15:16:00 -07:00 |
|
Jordan Hall
|
c7d9b316ef
|
Seperated out class_singleWorker (POW thread)
|
2013-06-21 22:32:22 +01:00 |
|
Jaxkr
|
85ea62d678
|
Added icns with transparency
|
2013-06-21 14:13:59 -06:00 |
|
Jonathan Warren
|
32aaaf2023
|
Fix bugs in githup pull request #238
|
2013-06-21 15:44:28 -04:00 |
|
Jaxkr
|
af9dbda5d3
|
Fixed capitalization of Application Support, which causes problems for people with a case sensitive OS X file system
|
2013-06-21 12:26:33 -06:00 |
|
DivineOmega
|
d2d2d8c380
|
Fixed translate functions not being found as they were being defined after the QT GUI was started
|
2013-06-21 16:24:04 +01:00 |
|
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
|
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 |
|
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 |
|