citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
945 Commits 3 Branches 0 Tags 36 MiB
Commit Graph

945 Commits

Author SHA1 Message Date
Jonathan Warren 7ad8ce7e1b Merge pull request #446 from Atheros1/master 
Convert 'API Error' to raise APIError()
 2013-08-25 20:52:52 -07:00
Jonathan Warren 14a968b499 github demanded a manual merge 2013-08-25 22:52:38 -04:00
Jonathan Warren 0d69ebb125 Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error 2013-08-25 22:38:51 -04:00
Jonathan Warren 3c90728e69 Merge pull request #442 from Atheros1/master 
manually undid much of pull #287. Discussion in #398
 2013-08-25 16:36:16 -07:00
Jonathan Warren 4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren 84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger 
class_sqlThread.py - changing prints to loggers
 2013-08-25 16:07:45 -07:00
Jonathan Warren eeddd7f2b5 Merge pull request #393 from erikackermann/patch-1 
Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
 2013-08-25 16:04:19 -07:00
Jonathan Warren 1496177892 Merge pull request #441 from Atheros1/master 
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
 2013-08-25 16:00:05 -07:00
Jonathan Warren 1b5158d658 refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable 2013-08-25 18:55:53 -04:00
Jonathan Warren f317fafbb3 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-08-25 16:24:03 -04:00
Jonathan Warren ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -04:00
Jonathan Warren a20cff425c Merge pull request #425 from rakoo/fix-archpackage 
Fix Archlinux package creation
 2013-08-25 13:15:06 -07:00
Jonathan Warren 2614975163 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-08-25 16:03:24 -04:00
Jonathan Warren 7146823b10 Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error 2013-08-25 16:02:02 -04:00
Jonathan Warren 0c2ce666c2 Merge pull request #440 from Atheros1/master 
Swap print statements for logging statements
 2013-08-25 12:59:32 -07:00
Jonathan Warren 4c920fd153 resolve merge conflict 2013-08-25 15:56:20 -04:00
Jonathan Warren 83f3d81251 Merge pull request #439 from Atheros1/master 
Small package modifications
 2013-08-25 11:11:18 -07:00
Jonathan Warren 82db79ca39 removed option from previous commit which allowed user-settable maximum network message size pending further discussion 2013-08-24 20:23:49 -04:00
Jonathan Warren a5c65f11e8 resolve merge conflict 2013-08-24 20:18:46 -04:00
Jonathan Warren 9a4d7a7801 Merge pull request #435 from Atheros1/master 
show number of each message type processed in the API command clientStat...
 2013-08-24 16:48:57 -07:00
Jonathan Warren 0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04:00
Jonathan Warren 28b6b743e3 Merge pull request #423 from grant-olson/language_only_localization_fallback 
Fallback to language only localization
 2013-08-21 20:04:26 -07:00
Matthieu Rakotojaona bcff27ff7c Fix Archlinux package creation 2013-08-21 00:02:57 +02:00
Grant T. Olson 8895676317 Fallback to language only localization 2013-08-20 08:41:28 -04:00
Jonathan Warren 7772484da9 Merge pull request #419 from bitnukl/master 
Add German translation
 2013-08-19 13:57:35 -07:00
Jonathan Warren e86915fae2 Merge pull request #414 from grant-olson/bad_osx_namecoin_config 
Fix bad namecoin config lookup on OSX
 2013-08-19 13:57:02 -07:00
bitnukl ca1df35c5a translated namecoin settings, fixed some html issues 2013-08-17 18:23:19 +00:00
bitnukl 48f3e7084c Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-17 01:19:21 +02:00
Erik Ackermann 738c58694c Responded to comment from jvz; fixed brew install instructions. 2013-08-16 19:02:40 -04:00
Grant T. Olson 66724acbf4 Fix bad namecoin config lookup on OSX 2013-08-16 17:26:03 -04:00
Jonathan Warren 553a164c3b Merge pull request #404 from grant-olson/detect_RE_as_reply 
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
 2013-08-15 13:15:15 -07:00
Jonathan Warren 16d94f0ef4 Merge pull request #406 from chovy/patch-1 
add installation
 2013-08-15 13:14:58 -07:00
Jonathan Warren 9278a7dd3a Merge pull request #412 from grant-olson/move_osx_python_check 
App fails with system python before OSX system check
 2013-08-15 13:14:35 -07:00
bitnukl 5f56f11955 added complete german translation 2013-08-15 20:51:09 +02:00
Grant T. Olson b222693d98 Have OSX check run before we import classes and error out 2013-08-15 11:37:23 -04:00
Jonathan Warren 49d16a502e Merge pull request #410 from Atheros1/master 
added some more error handling
 2013-08-14 16:47:51 -07:00
Jonathan Warren b092df7e58 added some more error handling 2013-08-14 19:46:59 -04:00
Jonathan Warren 6ec4d5c73a Merge pull request #409 from Atheros1/domob1812-namecoin-id2 
Domob1812 namecoin id2
 2013-08-14 16:19:20 -07:00
Jonathan Warren 077177b742 Dont show Fetch button if cannot connect to Namecoin 2013-08-14 18:59:50 -04:00
Anthony Ettinger f946c5d582 add installation 
people will likely go straight to installation page, so I added to readme.
 2013-08-13 22:18:16 -07:00
Jonathan Warren 2a9a9f2508 Merge pull request #405 from grant-olson/fix_for_401_traceback_in_log_output 
Fix for traceback on OSX.  Fixes Bitmessage/PyBitmessage#401
 2013-08-13 14:42:54 -07:00
Grant T. Olson 8e01727ee4 Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE: subject when replying. Fixes Bitmessage/PyBitmessage #382 2013-08-12 20:36:44 -04:00
Grant T. Olson 0026dce551 Fix for traceback on OSX. Fixes Bitmessage/PyBitmessage#401 2013-08-12 20:32:13 -04:00
Jonathan Warren 27f10f6ac1 fix merge conflicts 2013-08-12 00:09:36 -04:00
Grant T. Olson 2526608c39 Convert 'API Error' to raise APIError() 
Catch of unhandled exceptions and return them as new API Error 21 - Unexpected API Failure

_decode method that transforms "!!!".decode('hex')errors to new API Error 22: Decode Error
 2013-08-11 16:22:03 -04:00
Bob Mottram 3ff76875aa Packaging updated to be architecture independent 2013-08-11 12:07:54 +01:00
Jordan Hall b44066e5f5 Merge branch 'master' of https://github.com/DivineOmega/PyBitmessage into class_sqlThread_logger 2013-08-11 00:17:49 +01:00
Jordan Hall f6fe3ae25f Resolving upstream conflicts 2013-08-11 00:16:28 +01:00
Jordan Hall 9d3a0a160f Merging with master and resolving conflicts 2013-08-11 00:08:48 +01:00
Jordan Hall f83b636bc0 Converted print statement in class_sqlThread to logger calls 2013-08-11 00:02:38 +01:00