523 commits

Author	SHA1	Message	Date
thomasv	8fe6673814	typo	2012-10-12 09:41:49 +02:00
thomasv	d25724a621	simplify read_common_config. do not break loop so that we read both files	2012-10-12 09:35:09 +02:00
ThomasV	d92f1991a9	move prompt_password from wallet.py to main script	2012-10-12 01:50:54 +02:00
ThomasV	c7311a1e7f	fix for gtk gui	2012-10-12 01:32:26 +02:00
ThomasV	7959417751	small fixes for gtk gui	2012-10-12 01:21:50 +02:00
ThomasV	10119dfed3	fix: inheritance	2012-10-12 01:13:54 +02:00
ThomasV	ca3fa8c6dd	cleanup	2012-10-11 22:27:48 +02:00
ThomasV	d0c8a48274	encapsulate parse_proxy_options	2012-10-11 21:37:02 +02:00
ThomasV	f0556bb0d3	rename conf file section as 'client'. add gui to conf	2012-10-11 21:07:49 +02:00
thomasv	5444f55e6b	big refactoring: command line options and electrum.conf options override settings in wallet file.	2012-10-11 20:10:12 +02:00
thomasv	0d11aa75c4	encapsulation: that kind of exception handling should be done in the gui module	2012-10-11 13:43:04 +02:00
thomasv	299d54c6ec	fix: the gtk gui was broken since server_list_changed was introduced...	2012-10-11 13:18:04 +02:00
thomasv	596bddbf7e	replace expert mode with a button for gui_detailed_view	2012-10-11 12:56:57 +02:00
thomasv	da9351260c	move proxy fallback away from send method	2012-10-10 10:16:18 +02:00
Maran	c1fa13d0f6	Disabled the proxy input fields when None is selected	2012-10-09 22:07:39 +02:00
Maran	3ce5eef076	Merge branch 'master' of https://github.com/spesmilo/electrum	2012-10-09 17:15:05 +02:00
Maran	8833555b35	Add fallback for users who ran master with the old default config	2012-10-09 17:13:26 +02:00
thomasv	93ac0e806b	make connection message slightly less invasive	2012-10-09 16:52:16 +02:00
thomasv	cfce1420c5	proxy: allow '-p none'	2012-10-09 16:16:00 +02:00
thomasv	fd13d19cb8	fix proxy issues: override config with command line option, and use interface.proxy in gui	2012-10-09 15:48:06 +02:00
thomasv	880b08f337	remove remote wallet (broken, will be replaced)	2012-10-05 15:49:03 +02:00
thomasv	c479261043	restored initial text (users should know what seed means), and added a warning against phishing	2012-10-02 13:41:38 +02:00
thomasv	e7e9e8916b	fix set_server. keep compatibility with the gtk interface	2012-10-02 12:52:47 +02:00
thomasv	385b515439	fix proxy config: read from simpleconfig object	2012-10-02 12:40:08 +02:00
thomasv	287c7fc643	split create_new_address, so that get_new_address can be used without the context of a wallet	2012-10-01 18:31:54 +02:00
thomasv	8d9e5a4f2e	remove ecdsa.org from default servers; too much downtime	2012-10-01 18:25:32 +02:00
thomasv	f3ff9b5cf6	make proxy an optional parameter	2012-10-01 18:14:50 +02:00
thomasv	44dd7713e5	debugging options should not be parameters, it makes the code unnecessarily complictated	2012-10-01 17:41:47 +02:00
thomasv	8fd1dbadf6	use https for aliases	2012-10-01 15:10:51 +02:00
Maran	ae991f4407	Added the ability to make a copy of your wallet so ungeeky people can still create a backup in a place they can easily reach	2012-09-24 18:11:30 +02:00
Maran	504ea37c79	Made cfg an class attribute and fixed server changing for lite gui since proxy got added	2012-09-21 23:18:32 +02:00
Maran	a08f2660df	Use True flag for set key	2012-09-21 23:13:46 +02:00
Maran	23ffbc3e48	Fixed merged conflict and added folder creation on first load	2012-09-21 16:57:54 +02:00
Maran H.	c486c6d55f	Merge pull request #33 from bkkcoins/startup-gui-option ... Startup gui option	2012-09-21 07:20:59 -07:00
bkkcoins	23b1ccaf39	Merge branch 'socks-support' into merged	2012-09-21 15:14:48 +07:00
bkkcoins	2bf2f76a2a	small edit to config syntax	2012-09-21 15:14:16 +07:00
bkkcoins	43d9710cac	Merge branch 'startup-gui-option' into merged	2012-09-21 15:11:24 +07:00
bkkcoins	413e5b9cc4	Merge branch 'window-position' into merged	2012-09-21 15:11:19 +07:00
bkkcoins	ad24870a03	small edit to config syntax	2012-09-21 15:10:43 +07:00
bkkcoins	38acaf0a3a	small change to config syntax	2012-09-21 15:06:21 +07:00
bkkcoins	4c65822f32	merged current branches	2012-09-21 13:05:37 +07:00
bkkcoins	1ca0595653	Merge branch 'startup-gui-option' into merged	2012-09-21 13:03:36 +07:00
bkkcoins	3007d95ceb	Added code to remember window position	2012-09-21 10:53:14 +07:00
bkkcoins	fccd9921eb	adjust whitespace only	2012-09-21 08:52:33 +07:00
bkkcoins	e43264538d	adjust whitespace only	2012-09-21 08:51:28 +07:00
bkkcoins	01b300562e	Added settings dialog option for gui startup mode	2012-09-21 08:47:56 +07:00
bkkcoins	8244768654	Changed how load_config works so it always supports new config vars	2012-09-21 04:48:03 +07:00
bkkcoins	9121654e8a	Added proxy settings save to config.json	2012-09-20 18:24:36 +07:00
bkkcoins	09c90c0971	Revert "Revert "Added proxy options to network dialog"" ... This reverts commit 6e0b3620d2.	2012-09-20 16:55:28 +07:00
bkkcoins	6e0b3620d2	Revert "Added proxy options to network dialog" ... This reverts commit 83bb644135.	2012-09-20 16:55:15 +07:00