Commit Graph

178 Commits

Author SHA1 Message Date
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
Jonathan Warren 176340c22d added api command: getPubkeyByHash 2013-08-08 17:50:12 -04:00
Jonathan Warren 107c9376c5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-07 15:21:31 -04: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
RemideZ 68b2350276 Nicer formatting 2013-07-02 20:25:18 +02:00
RemideZ 8df9dc5731 Update bitmessagemain.py 2013-07-02 13:52:55 +02:00
Linker Lin 4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
miao.lin 0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
Jonathan Warren 0b08fe6bad Some initial coding work for chans 2013-06-26 11:55:33 -04:00
Jonathan Warren b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren c4d09693d5 Merge pull request #240 from acejam/master
Added folder to select statement & changed received to receivedTime
2013-06-24 20:56:58 -07:00
Jonathan Warren 5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
Jordan Hall 9925d55df2 Removed unused imports from bitmessagemain 2013-06-23 21:30:16 +01:00
Jordan Hall 3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain 2013-06-23 19:13:07 +01: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
Jordan Hall c7d9b316ef Seperated out class_singleWorker (POW thread) 2013-06-21 22:32:22 +01:00
Jonathan Warren 32aaaf2023 Fix bugs in githup pull request #238 2013-06-21 15:44:28 -04: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 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