Commit graph

266 commits

Author SHA1 Message Date
Sebastiaan Pasma
b19704e633
Text change Mining Pool + template.pot change 2018-10-04 11:40:48 +02:00
Brendon Duncan
8bf31f97d8 Updated translations from Crowdin. 2018-09-15 18:00:34 +12:00
Jean-Baptiste Dominguez
b6f63706f3 Resolution conflicts 2018-09-06 18:21:04 +09:00
Jean-Baptiste Dominguez
688f2b97bc
Merge pull request #324 from Bitcoin-com/wallet/task/546
546 - revamp shapeshift service
2018-09-06 17:13:05 +09:00
Jean-Baptiste Dominguez
98e6e8ac75 Recommendation #brendon :) 2018-09-06 15:17:37 +09:00
Brendon Duncan
394317bc46 Better default error message for Shapeshift error. 2018-09-06 11:27:48 +12:00
Jean-Baptiste Dominguez
2cec6a476b
Merge pull request #294 from Bitcoin-com/wallet/task/556
Improvement - 556 - Make "Share the Wallet App" translatable
2018-09-04 14:33:15 +09:00
Jean-Baptiste Dominguez
911247e463
Merge branch 'wallet/sprint/21' into wallet/task/501 2018-09-04 14:31:22 +09:00
Jean-Baptiste Dominguez
7353e0ff06
Merge pull request #320 from Bitcoin-com/wallet/task/492
492 - Fix typo in English original source
2018-09-04 14:08:42 +09:00
Brendon Duncan
8908b5ef80 Send max button behaviour is now conditional based on min and max limits. 2018-09-03 20:12:20 +12:00
Brendon Duncan
918451f3da Scanning or pasting ordinary URL gives the option to open it in a browser. 2018-08-30 19:56:18 +12:00
Brendon Duncan
98f317dea7 Merged more permissive Bitcoin Cash URIs. 2018-08-30 18:16:26 +12:00
Brendon Duncan
5747cbfb66 "Testnet not supported" message when scanning a testnet address. 2018-08-30 15:49:59 +12:00
Brendon Duncan
529bdf3386 Alert and resume scanning if data is not recognised. 2018-08-29 18:28:37 +12:00
Sebastiaan Pasma
3cab114618
template.pot change 2018-08-27 14:09:06 +02:00
Sebastiaan Pasma
ed998e9036
Make "Share the Wallet App" translatable 2018-08-22 16:27:30 +02:00
Jean-Baptiste Dominguez
ef6b52c6e9 translation 2018-08-21 10:42:12 +07:00
Brendon Duncan
bb92f5ec1b Merged updated sprint/21. 2018-08-20 11:31:49 +12:00
Sebastiaan Pasma
abe71a8077
typo in template.pot 2018-08-14 10:27:27 +02:00
Brendon Duncan
058fc617bb Merged text changes. 2018-08-14 14:43:42 +12:00
Jean-Baptiste Dominguez
24033f4615
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-14 11:41:31 +09:00
Jean-Baptiste Dominguez
947c2d324f Upgrade text 2018-08-14 11:38:24 +09:00
Brendon Duncan
4e2c06f69d Changed "Bitcoin" to "Bitcoin Core" on the Sweep Paper Wallet screen and made other strings translatable. 2018-08-14 12:24:10 +12:00
Sebastiaan Pasma
587971724e
template.pot change 2018-08-13 16:52:00 +02:00
Sebastiaan Pasma
5123ba9007
template.pot fix 2018-08-13 15:33:48 +02:00
Sebastiaan Pasma
14406f6bc4
template.pot fix 2018-08-13 15:28:22 +02:00
Sebastiaan Pasma
1dad3ab3fd
Many translation fixes. Missing translations in template.pot and added some in views 2018-08-13 13:48:41 +02:00
Jean-Baptiste Dominguez
c8d7e88f81
Merge branch 'wallet/sprint/20' into wallet/dev 2018-08-09 15:52:48 +09:00
Jean-Baptiste Dominguez
037c00ec9e
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 11:23:35 +09:00
Jean-Baptiste Dominguez
7f0946b390
Merge branch 'wallet/sprint/20' into wallet/task/441 2018-08-08 10:56:26 +09:00
Jean-Baptiste Dominguez
06ffa4c233
Merge pull request #226 from Bitcoin-com/wallet/task/442
442 - Missing "Price Display" translation
2018-08-08 10:54:21 +09:00
Jean-Baptiste Dominguez
ecad91d328
Merge pull request #237 from Bitcoin-com/wallet/task/439
439 - Enter Amount screen modifications
2018-08-08 10:53:59 +09:00
Brendon Duncan
fb4bc1563c Starting to integrate BIP70 payment protocol into new send flow. 2018-08-06 12:04:14 +12:00
Sebastiaan Pasma
f49e8725e8
Translations additions + some (s)css + review transaction changes 2018-08-02 16:05:12 +02:00
Sebastiaan Pasma
391201471d
Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514
# Conflicts:
#	i18n/po/template.pot
#	src/js/controllers/amount.js
#	www/css/main.css
2018-08-02 15:12:40 +02:00
Brendon Duncan
438ab94404 Strings for translation. 2018-08-02 10:20:03 +12:00
Sebastiaan Pasma
5372ba3dac
Merge remote-tracking branch 'origin/wallet/task/439' into wallet/task/514
# Conflicts:
#	src/js/controllers/amount.js
2018-08-01 11:16:59 +02:00
Brendon Duncan
52f1e93e5b Header text. 2018-08-01 11:36:25 +12:00
Sebastiaan Pasma
42d77903e1
Third Party Service integration (Shapeshift) (CSS + translations + wallet selector + routes) 2018-07-31 17:21:56 +02:00
Sebastiaan Pasma
281b969fc3
Shapeshift refactor / Empty case / CSS 2018-07-31 15:03:20 +02:00
Jean-Baptiste Dominguez
e344fd567b Add translations and remove googletagmanager 2018-07-27 17:45:12 +09:00
Sebastiaan Pasma
54478a4848
translation + faster transition 2018-07-19 10:23:10 +02:00
Sebastiaan Pasma
4f4bee27f1
Options also translatable 2018-07-19 09:59:56 +02:00
Sebastiaan Pasma
8c124fba19
price display translation 2018-07-18 11:29:03 +02:00
Brendon Duncan
cc907251f7 Removing unused services, and making string translatable. 2018-07-18 17:20:59 +12:00
Brendon Duncan
afd560187e Merged translations.
# Conflicts:
#	i18n/po/template.pot
2018-07-18 11:01:31 +12:00
Brendon Duncan
19327f84f0 Merged wallet/sprint/20 into wallet/task/477. 2018-07-18 10:51:34 +12:00
Brendon Duncan
ef121f52fa Merged wallet/sprint20 into wallet/task/475.
# Conflicts:
#	src/js/services/bitcoincomService.js
2018-07-18 10:47:43 +12:00
Sebastiaan Pasma
6463d5df34
Merge branch 'wallet/sprint/20' into wallet/task/426 2018-07-17 13:41:09 +02:00
Brendon Duncan
30b847322a Added wallet ready message to template. 2018-07-17 12:33:52 +12:00