Commit Graph

8857 Commits

Author SHA1 Message Date
nimbosa 4694a65592
Merge branch 'master' into master 2019-01-05 16:28:54 +08:00
nimbosa e7927e5432
FIX: Electrum locale download URL
Merge pull request #187 from Legogris/fix-electrum-locale-url
2019-01-05 12:38:11 +08:00
nimbosa e4e2dbfb99
Merge pull request #186 from Legogris/update-docker-file
Update Dockerfile
2019-01-05 12:32:03 +08:00
nimbosa 9ebc609dee
fix overwrite server in network dialog
Merge pull request #184 from Skellers21/master
2019-01-05 12:14:22 +08:00
Robert Edström 5d95baab35 Fix Electrum locale download URL 2018-12-09 17:10:43 +01:00
Robert Edström 907eb551d9 Fix release github.com URL in Dockerfile 2018-12-09 15:33:09 +01:00
Robert Edström 3c65a006bc Update version in Dockefile to 1.0.6 2018-12-09 15:32:42 +01:00
Skellers21 669e504043 fix overwrite server in network dialog 2018-10-16 16:09:31 +01:00
nimbosa 6401c83068
Update links and version 1.0.7 / 3.1
Electrum-ZCL v1.0.7
based on Electrum v3.1
2018-09-14 19:27:30 +08:00
seth Nimbosa 28f94dc76f
update to electrum 3.1
Merge pull request #1 from https://github.com/z-classic/electrum-zcl/tree/merge/3.1
2018-09-14 19:01:34 +08:00
seth Nimbosa 7be95aae05
Merge branch 'master' into merge/3.1 2018-09-14 17:19:54 +08:00
seth Nimbosa 7c05c48049
Merge pull request #2 from z-classic/master
merge master+skellers
2018-09-14 17:16:22 +08:00
seth Nimbosa fcffa73f94
Merge pull request #178 from Skellers21/master
various updates to 1.0.6
2018-09-14 17:03:17 +08:00
Skellers21 87ac005645 update mainnet block explorers 2018-09-04 22:39:44 +01:00
Skellers21 7e79dea1e8 added donation to Zclassic menu item 2018-09-02 10:44:25 +01:00
Skellers21 5737b613d8 various link and text updates 2018-09-02 09:59:06 +01:00
Skellers21 87d299dc68 various README updates 2018-09-02 08:35:31 +01:00
Skellers21 b8aac56385 update version to 1.0.6 2018-09-01 22:57:42 +01:00
Skellers21 7d0aa7a047 updated servers list 2018-09-01 21:38:08 +01:00
Skellers21 2f63cce92f updated to python-dns 2018-09-01 21:15:04 +01:00
Skellers21 28251d26a3 mainnet block explorer 2018-09-01 19:07:23 +01:00
Skellers21 130661f217 update mainnet block explorers 2018-09-01 18:55:55 +01:00
Jon Layton 757c2b93b0 Removed leftovers, added back HEADERS_URL 2018-03-05 20:51:39 -06:00
Jon Layton 75c1b17681 Post-merge fixups, runs, doesnt connect 2018-03-05 20:04:28 -06:00
Jon Layton 0ca9fc8391 Merge remote-tracking branch 'up/master' into HEAD 2018-03-05 19:40:10 -06:00
Johann Bauer 4c81a77ccc
Revert "Check if value has 'is_nan' before calling it"
This reverts commit 1451c66a8f.
2018-03-05 23:24:12 +01:00
Johann Bauer 1451c66a8f
Check if value has 'is_nan' before calling it
Fixes: #4034
2018-03-05 23:07:52 +01:00
Johann Bauer 2bde686752
Windows Build: Create tmp dir 2018-03-05 17:16:30 +01:00
ThomasV 360dd5a7aa
Merge pull request #4028 from SomberNight/wizard_menu_master_key_str
wizard: rename option to "use a master key"
2018-03-05 13:03:26 +01:00
SomberNight 2fdbfa6b81 wizard: rename option to "use a master key" 2018-03-05 12:58:03 +01:00
脇山P 122cb08dc6 Add JPY exchange rate (#4016) 2018-03-05 12:08:10 +01:00
SomberNight 81666bf9ac fix #4026 2018-03-05 11:44:03 +01:00
ThomasV e971bd8498 update release notes, add date 2018-03-05 10:39:29 +01:00
ThomasV fe67012f71
Merge pull request #4025 from SomberNight/release_notes_3_1
release notes: 3.1 - more stuff
2018-03-05 10:15:07 +01:00
ThomasV 89599cf0d5 simplify fee preferences dialog 2018-03-05 10:12:44 +01:00
ThomasV 0bca97dd2f improve fee status message 2018-03-05 09:49:17 +01:00
SomberNight fd4142703c typo in prev 2018-03-05 09:43:45 +01:00
SomberNight e537b58d10 release notes: 3.1 - more stuff 2018-03-05 09:39:55 +01:00
ThomasV 2b5117ab3d kivy: fix tx dialog message 2018-03-05 09:37:25 +01:00
SomberNight 219ea6588b update default server list 2018-03-05 06:00:24 +01:00
ThomasV c9b0840c78 kivy: minor fixes related to exchange rates 2018-03-04 23:58:38 +01:00
ThomasV c3ff6040d2
Merge pull request #4008 from SomberNight/network_constants_refactor
refactor network constants
2018-03-04 23:13:50 +01:00
SomberNight 81b6d65764 refactor network constants 2018-03-04 22:10:59 +01:00
ThomasV 1c0e23c8b9 Revert "Add JPY exchange rate"
This reverts commit c2da8eb46d.
2018-03-04 10:35:14 +01:00
ThomasV 56c94153ff kivy: simplify fee dialog 2018-03-04 10:29:56 +01:00
ThomasV 451ac0d259
Merge pull request #4007 from wakiyamap/add_jpy_exchange_rate
Add JPY exchange rate
2018-03-04 09:31:45 +01:00
WakiyamaP c2da8eb46d Add JPY exchange rate 2018-03-04 04:48:08 +09:00
Johann Bauer 10057b18de
Cache dependencies for Travis build
Also: * Move temporary directory to /tmp
      * Remove files with wrong hash (so we don't have to remove them manually)
2018-03-03 19:58:31 +01:00
Johann Bauer 83f2dc44de Add websocket library to binary for Ledger 2FA support
Closes: #2433
2018-03-03 19:37:32 +01:00
ThomasV 2e594d2d7a kivy: simplify fee dialog 2018-03-03 14:58:55 +01:00