Commit Graph

119 Commits

Author SHA1 Message Date
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 151ca020df Correct indent on a single line 2013-07-15 19:36:37 -04:00
Jonathan Warren 73f3b5d92c Merge pull request #297 from mybluevan/master
Adding configuration to listen for incoming connections when connected via SOCKS proxy
2013-07-15 15:05:15 -07:00
Jonathan Warren 08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
David Nichols 97f0c56aa8 Adding configuration option to listen for connections when operating with a SOCKS proxy. 2013-07-12 13:03:09 -05:00
Rainulf Pineda a3cdc28bbf Fixed crash on sql query. 2013-07-12 05:02:21 -04:00
Rainulf Pineda 997a8ff13a Sent search. 2013-07-12 04:42:52 -04:00
Rainulf Pineda 45cfead4d0 Inbox search. 2013-07-12 04:24:24 -04:00
Daniel Kraft 92e2970767 Support NMControl.
Optionally support querying nmcontrol instead of namecoind,
including UI for selecting the preference.
2013-07-07 20:04:57 +02:00
Daniel Kraft 06bdc030bd Report success in status bar.
Report success when fetching a BM address from
namecoin in the status bar.
2013-07-07 18:43:09 +02:00
Daniel Kraft 213d92b88a Add UI to test namecoin connection.
Add a test button to namecoin UI settings, which tries
out the connection and reports its result back.  Also use
namecoin.conf as config file to load default RPC user/pass
combination from.
2013-07-07 18:41:13 +02:00
Daniel Kraft 68fbc4b344 UI for namecoin connection settings.
Add a pane to the settings dialog UI which allows to edit
the connection settings for namecoin.
2013-07-07 17:34:43 +02: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
Jonathan Warren 39f4f85b11 removed apparently unnecessary loop 2013-07-05 16:43:40 -04:00
Jonathan Warren 1f8eee4119 removed apparently unnecessary loop 2013-07-05 16:01:20 -04:00
Daniel Kraft 03bb54fc98 Handle options for RPC connection.
Handle config options for RPC connection, and also implement loading
default user/password from namecoin config file.  No UI yet.
2013-07-05 20:08:19 +02:00
Daniel Kraft 09c0aa993f Implement JSON RPC myself.
Write my own implementation of JSON RPC and HTTP queries, because
the jsonrpc module failed to let me configure what to do with
failed HTTP authentications.
2013-07-05 19:08:39 +02:00
Daniel Kraft 9aa82db81f Basic implementation.
Implement very rough first query implementation, with
still hardcoded connection details.
2013-07-05 18:14:47 +02:00
Daniel Kraft 19331b641a Start with namecoin connection module.
Create a still mostly empty module to encapsulate the
namecoin address query, and use it from the UI.
2013-07-05 17:29:49 +02:00
Daniel Kraft 9a5d048691 Add fetch from namecoin button to UI.
Add the new button to the UI, and register onclick handler
to fill in the to field with a dummy address for now.
2013-07-04 22:06:30 +02:00
RemideZ 8bf8e47cd1 Update __init__.py 2013-07-02 13:52:16 +02:00
Linker Lin 4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
linkerlin 80e5adad8c Made it compatible with gevent 1.0dev version. 2013-06-28 22:26:31 +08:00
miao.lin 9fa90ccc3f Sleep more , save more. 2013-06-28 17:50:43 +08:00
miao.lin e8eaf65f07 Sleep more , save more. 2013-06-28 17:48:32 +08:00
miao.lin 3eea6d6a88 Removed a blank line. 2013-06-28 17:28:17 +08:00
miao.lin 5df22b4181 Made gevent happy with PyQt. 2013-06-28 16:45:03 +08:00
Jonathan Warren 8bd00dc730 added newchandialog.py 2013-06-25 17:14:44 -04:00
Jonathan Warren b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren 1b13b74dbd Merge pull request #251 from deliaeris/patch-1
spelling
2013-06-24 20:57:48 -07:00
Jonathan Warren c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
Delia Eris cc304b4e8b spelling
implimented -> implemented
2013-06-23 21:49:18 -05:00
Jonathan Warren 936369da0a manual implement Github issue #223 2013-06-20 16:41:14 -04:00
Jonathan Warren 76f851b7a2 manual merge acejam-master 2013-06-20 07:51:02 -04:00
Jonathan Warren 930a12fec7 manual merge, also be careful of international characters 2013-06-19 16:49:31 -04:00
Jonathan Warren 69267fb6fe Fix issue #212 to support international characters 2013-06-19 13:10:43 -04:00
Jonathan Warren 5aedc385b8 Manual merge github issue #212 2013-06-19 12:19:07 -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 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
nimda 3865d3cb9f 'Save message as...' option in Inbox 2013-06-16 18:28:18 -04:00
Jonathan Warren 5938efca1a Manual merge and fix Github issue #213 2013-06-14 15:58:46 -04:00
Gatien Bovyn 0343c67b95 applied Atheros1 commit for error handling around .encrypt
commit 8d7eceb18e
2013-06-14 13:20:38 +02:00
Gatien Bovyn cad151a440 strings comparaison failed with translation: fixed 2013-06-14 12:47:46 +02:00
nimda e6beeedea1 str() for luck 2013-06-13 22:28:33 -04:00
nimda e7378cffcc actually add status bar message. 2013-06-13 22:27:52 -04:00
nimda 98aacd16ff Subscribe to an address in the addressbook 2013-06-13 21:55:38 -04:00