Carlos Killpack
7af8318ab4
Converted some more print statements.
2013-06-22 17:04:03 -06:00
Carlos Killpack
9fb8fda02d
Merge https://github.com/fiatflux/PyBitmessage
2013-06-22 16:50:38 -06:00
Carlos Killpack
c9c5560d12
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-06-22 16:33:48 -06:00
Jonathan Warren
c2f493b595
Fix issue #246
2013-06-22 10:55:15 -04:00
Jonathan Warren
32aaaf2023
Fix bugs in githup pull request #238
2013-06-21 15:44:28 -04:00
Carlos Killpack
59fdb0b69b
This is never going to be executed, no need for a shebang.
2013-06-21 11:11:35 -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
Gregor Robinson
c1a30d3f54
Fix typos introduced by 6d11e5a.
2013-06-20 22:54:08 -06:00
Gregor Robinson
6c45482323
Merge branch 'master' of https://github.com/xj9/PyBitmessage
...
Conflicts:
src/bitmessagemain.py
2013-06-20 22:28:27 -06:00
Gregor Robinson
972300cd1b
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-06-20 21:58:12 -06:00
Gregor Robinson
6d11e5a680
More print -> logger translations.
2013-06-20 21:57:24 -06:00
Jordan Hall
138877f5f7
Placed repeated inbox and sent SQL operations into appropriate helper functions
2013-06-21 00:25:01 +01:00
Carlos Killpack
ab1164f4b6
Converted a bunch more print statements to logger calls, fixed some long comments
2013-06-20 17:23:10 -06:00
Jordan Hall
423e83d77c
Split off some bootstrap and startup helper functions into their own files
2013-06-20 23:55:04 +01:00
Carlos Killpack
a46e4e457e
Converted more print statements into logger calls'
2013-06-20 16:36:45 -06:00
Carlos Killpack
ad2aa79a82
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-06-20 16:08:24 -06: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
Gregor Robinson
0f0ff3ae6b
Don't log self.data
...
Too much data to print to screen except, perhaps, in exceptional circumstances.
2013-06-20 14:38:05 -06:00
Gregor Robinson
3cfbc23680
Merge remote-tracking branch 'xj9/master'
...
Conflicts:
src/bitmessagemain.py
2013-06-20 14:31:00 -06:00
Jonathan Warren
a6c9ff288e
manuall merge github issue #229
2013-06-20 16:04:50 -04:00
Gregor Robinson
dcb29d0c5b
Undoing stupid unintentional formatting change.
2013-06-20 13:53:41 -06:00
Gregor Robinson
521c800168
Continue migration from print messages
...
This is continuing xj9's work to migrate from print-based logging to
Python logger-based log messages. This still has a long way to go.
This also also has some minor formatting changes for readability,
especially for those of us not coding on an enormous HD monitor.
(Forgive me!)
2013-06-20 13:51:09 -06:00
Gregor Robinson
87cbfe9434
Continuing migration from print-based logging.
2013-06-20 13:17:11 -06:00
Carlos Killpack
da687134e2
Updated in reponse to comments in pull/234, changed some more print statements into logger calls
2013-06-20 12:16:21 -06:00
Carlos Killpack
5e93256be6
That was supposed to be in a different branch
2013-06-20 10:14:42 -06:00
Carlos Killpack
4b12b52e0f
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into debug
2013-06-20 10:06:12 -06:00
Carlos Killpack
f91a3c78c3
Created a logging configuration that supports various log levels, multiple output streams, and is inherently thread-safe. Changed some print calls to logger calls in bitmessagemain
2013-06-20 09:49:28 -06: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
Carlos Killpack
414c781cfc
Adding spanish translation
2013-06-20 01:03:49 -06: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
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
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
jordan@hall05.co.uk
28ed9676cc
Fixed indentation error (previous commit contained no files)
2013-06-19 12:29:28 +00:00
