Gregor Robinson
6d11e5a680
More print -> logger translations.
2013-06-20 21:57:24 -06: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
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
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
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
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
Jonathan Warren
fa91d31f42
adjust translation-related code
2013-06-17 17:49:06 -04:00
Jonathan Warren
48b5e26e46
Finished adjusted _translate function to work under daemon mode
2013-06-17 16:42:30 -04:00
nimda
5a10d997f9
tabs?
2013-06-16 18:38:27 -04:00
