Commit Graph

2816 Commits

Author SHA1 Message Date
ThomasV c89223ded9 revert WyseNynja's commit (breaks things) 2013-11-12 23:55:15 +01:00
ThomasV 5caa68a660 release notes 2013-11-12 23:21:42 +01:00
ThomasV 5ae39b5ad1 don't exit in wizard (fixes #402) 2013-11-12 22:55:42 +01:00
ThomasV 0a9ca37099 Merge branch 'master' of git://github.com/spesmilo/electrum 2013-11-12 22:47:55 +01:00
ThomasV e4052a3852 1.9.4 2013-11-12 22:47:52 +01:00
EagleTM f36343c288 Merge pull request #401 from iceTwy/master
Add all missing French translation strings
2013-11-12 11:32:03 -08:00
iceTwy 7699c2922e Add all missing French translation strings
Wikia revision: 4190
2013-11-12 20:10:27 +01:00
ThomasV 7ead6d18f2 fix tx signing with watching only wallets 2013-11-12 11:14:16 +01:00
ThomasV df76aac2db fix bug with hex_to_int; remove unused function 2013-11-12 10:14:29 +01:00
ThomasV 69639f901c Merge pull request #395 from WyseNynja/no_eval
stop using eval
2013-11-11 22:43:25 -08:00
Bryan Stitt 91061752cf stop using eval 2013-11-11 22:03:20 -08:00
EagleTM d93c642c5c Merge pull request #394 from maxplm/patch-1
Update version.py
2013-11-11 15:01:23 -08:00
maxplm 2f8b8bdaa7 Update version.py
Updated to pull 4183 from wikia because of 100% completed german translation.
2013-11-11 23:41:19 +01:00
ThomasV 4068c4bbf2 abort if file exists 2013-11-11 19:05:32 +01:00
ThomasV 353578986a file dialogs 2013-11-11 18:56:28 +01:00
ThomasV 588f8fd110 wallet: call create_accounts in save_seed 2013-11-11 17:41:46 +01:00
ThomasV ee141f6d37 fix connect on windows 2013-11-11 16:59:36 +01:00
ThomasV 2321cb9bb3 print less debug messages 2013-11-11 16:23:17 +01:00
ThomasV 1f13b2f4f3 network.send method 2013-11-11 16:18:40 +01:00
ThomasV 4eb767492b version 1.9.3 2013-11-11 10:36:43 +01:00
ThomasV 9db6f0c3b7 fix side effect in get_unspent_coins, causing transactions to be rejected 2013-11-11 10:35:28 +01:00
ThomasV 8d943ff9a2 Merge pull request #392 from wozz/gtk
Gtk update
2013-11-11 00:13:07 -08:00
Michael Wozniak 03fac376a1 prioritize button to match freeze button in gtk gui 2013-11-10 21:36:54 -05:00
Michael Wozniak 617382db54 Merge remote-tracking branch 'upstream/master' into clean 2013-11-10 17:16:09 -05:00
ThomasV 5be9b7c669 Merge pull request #388 from WyseNynja/fix_more_bare_except
fix more bare excepts
2013-11-10 14:14:11 -08:00
ThomasV df58fab5bd Merge pull request #390 from wozz/gtk
Gtk updates
2013-11-10 14:12:24 -08:00
Michael Wozniak d50d7efe18 Merge remote-tracking branch 'upstream/master' into clean 2013-11-10 17:00:00 -05:00
Michael Wozniak 698f8bccef add Balance column to receive tab in GTK gui 2013-11-10 16:54:32 -05:00
Michael Wozniak 7e5cad5452 Freeze button in GTK receive tab. 2013-11-10 16:36:52 -05:00
Bryan Stitt 6cd4ed486a fix more bare excepts 2013-11-10 12:30:57 -08:00
Maran 24cabcbee9 Switch icon based on OS, OS X requires dark icon 2013-11-10 18:11:26 +01:00
thomasv eae0c7c3b9 get_private_key: call get_seed first in order to check password 2013-11-10 15:22:22 +01:00
ThomasV ff647c79fd Merge pull request #374 from nolith/master
allow to connect to one server only
2013-11-10 02:55:33 -08:00
ThomasV 57e7eb2ff9 wallet.py: use get_seed in update_password 2013-11-10 11:51:56 +01:00
ThomasV 9056865bde Merge pull request #386 from WyseNynja/dont_use_base_exception
replace BaseException with Exception
2013-11-10 02:39:01 -08:00
ThomasV a7369a2bfd Merge pull request #385 from WyseNynja/ignore_gui_icons
ignore gui/icons_rc.py
2013-11-10 02:34:08 -08:00
Bryan Stitt 225d8b83a3 don't use bare except 2013-11-09 21:23:57 -08:00
Bryan Stitt f0eb0eccde replace BaseException with Exception 2013-11-09 20:21:02 -08:00
Bryan Stitt 8ece295f2e ignore gui/icons_rc.py 2013-11-09 20:17:22 -08:00
Eagle[TM] ba9782eec6 Update default server list (disable servers with failed/expired certs) 2013-11-10 01:26:06 +01:00
ThomasV adcda6153d Merge branch 'master' of git://github.com/spesmilo/electrum 2013-11-09 08:15:51 +01:00
ThomasV 30934b69db call check_seed in get_seed 2013-11-09 08:15:46 +01:00
ThomasV 30268156c8 Merge pull request #381 from atweiden/concealed-flag
concealed flag for restore sequence
2013-11-08 03:40:30 -08:00
thomasv 48bd2557b7 fix: store seed version 2013-11-08 12:35:27 +01:00
Andy Weidenbaum ef1c2c7760 concealed flag for restore sequence 2013-11-08 03:31:18 -08:00
thomasv 6458c0f591 don't show actinos that require private key if the wallet has no seed 2013-11-08 11:17:40 +01:00
ThomasV 1ae50daf28 Merge pull request #379 from wozz/clean
label editing in gtk
2013-11-07 23:55:28 -08:00
Michael Wozniak 3c6808468e add F and P to address types in recv tab for Frozen and Prioritized addresses 2013-11-07 20:43:16 -06:00
Michael Wozniak 2abb071533 network button fix for not connected to a network - GTK gui 2013-11-07 20:36:53 -06:00
Michael Wozniak ad498af71f add address type to receive tab in GTK GUI
I = imported
R = receive
C = change
2013-11-07 20:24:13 -06:00