Commit Graph

200 Commits

Author SHA1 Message Date
Jonathan Warren 3ae8dd8eee log traceback on API exception 2013-08-26 00:06:49 -04: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 4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -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 4c920fd153 resolve merge conflict 2013-08-25 15:56:20 -04:00
Jonathan Warren 0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04: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 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
Jordan Hall 53ca5b03ff Changing text for API Error 0007 log warning (cont.) 2013-08-10 23:13:15 +01:00
Jordan Hall 2c09326c37 Changing text for API Error 0007 log warning 2013-08-10 23:10:21 +01:00
Jordan Hall 326e294932 Reverted back to importing only logger instead of all of shared 2013-08-09 23:32:49 +01:00
Jordan Hall a69a00d186 Improved logger function calls and import shared here instead of debug 2013-08-09 23:26:16 +01:00
Jonathan Warren 176340c22d added api command: getPubkeyByHash 2013-08-08 17:50:12 -04:00
Jordan Hall 9710a86187 Minor spelling error: 'deamon' -> 'daemon' 2013-08-07 22:02:53 +01:00
merlink 7850e9aa68 Created Object for controlling bitmessage deamon 2013-08-07 21:46:23 +01:00
merlink 28acbac823 Added deamon modoe to main function 2013-08-07 21:46:22 +01:00
merlink f8cdfbfaa0 Changed start code for deamon mode 2013-08-07 21:46:22 +01:00
Jordan Hall 13196233a9 Merge with upstream and fixed conflicts 2013-08-07 21:40:01 +01:00
Jordan Hall ab4d53593b Fix to python version critical log message 2013-08-07 21:34:46 +01:00
Jordan Hall b529280160 Further fixes 2013-08-07 21:22:23 +01:00
Jordan Hall 26b82984a2 Fixes to logger function calls 2013-08-07 21:12:32 +01:00
Jonathan Warren 107c9376c5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-07 15:21:31 -04:00
Jordan Hall 0f357529ed bitmessagemain, changing prints tologger functions 2013-08-06 22:28:21 +01:00
Jonathan Warren d51fe37a66 added requested API commands for mobile device 2013-08-06 13:19:26 -04:00
merlink 084f67b10f Created Object for controlling bitmessage deamon 2013-08-06 13:23:56 +02:00
merlink 86383f0a9f Added deamon modoe to main function 2013-08-06 10:37:31 +02:00
merlink c5442029b5 Changed start code for deamon mode 2013-08-05 22:29:06 +02:00
Jonathan Warren 17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
Jonathan Warren 03200d3bb1 Small changes to API (backwards compatible) 2013-08-01 18:39:45 -04:00
Jonathan Warren 5c3bc63a1f Only allow 1 connection per IP 2013-08-01 12:16:31 -04:00
Grant T. Olson 04cb6575bd getInboxMessageIds and getSentMessageIds 2013-07-31 19:46:45 -04:00
Jonathan Warren 46c900f027 show Invalid Method error in same format as other API errors 2013-07-31 15:38:01 -04:00
Jonathan Warren f8f940cf30 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-31 12:37:06 -04:00
Jonathan Warren cddfe2c44f Only return one item for certain API commands 2013-07-31 12:08:56 -04:00
Jonathan Warren 8c0450ce39 having parameters here doesn't hurt anything 2013-07-30 19:53:09 -04:00
Grant T. Olson fbbc657380 Add listSubscriptions method to API 2013-07-30 19:41:40 -04:00
Jonathan Warren aa66d74d8d Small backwards-compatible changes to API 2013-07-28 18:25:52 -04:00
Daniel Kraft 665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/bitmessageui.py
	src/helper_startup.py
2013-07-27 08:24:52 +02:00
Jordan Hall 82282b03fe Made inbox message retrieval API function also return read status 2013-07-27 00:38:38 +01:00
Jonathan Warren c27494ace9 Further work to implement the Connect dialog on startup 2013-07-24 12:43:51 -04:00
Daniel Kraft a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
Jonathan Warren 52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
Jonathan Warren 1bf39dbfd0 moved debug.log file to the config directory 2013-07-14 16:12:59 -04:00
Jonathan Warren d93d923364 Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move 2013-07-13 20:35:06 -04:00
Daniel Kraft 7c89bacca5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-07 16:59:58 +02:00
Jonathan Warren a3d21dc880 Merge pull request #280 from RemideZ/master
macOSX compatibility
2013-07-05 15:29:07 -07:00
Daniel Kraft 8f39e35184 Add executable flag.
Mark bitmessagemain.py as executable.
2013-07-04 21:51:48 +02:00