Commit graph

12,824 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
e6ae1c0520 Add the command in package.json 2018-08-16 17:51:59 +09:00
Jean-Baptiste Dominguez
56be096207 quick fix for asn1 2018-08-16 17:51:20 +09:00
Jean-Baptiste Dominguez
acee3024a9 Quick fix for asn1 2018-08-16 17:51:08 +09:00
Brendon Duncan
33d780f2e5 The spinner in wallet details now spins when the infinite scroll spinner spins. 2018-08-16 15:44:59 +12:00
Brendon Duncan
93b6c3f1be Spinner same size as refresh button. 2018-08-16 15:00:51 +12:00
Sebastiaan Pasma
0ae6f043ed
loading new txs using pagination 2018-08-15 17:23:00 +02:00
Jean-Baptiste Dominguez
c27bfcb800
Merge pull request #282 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-15 17:27:52 +09:00
Brendon Duncan
c280adbb06 Merged view for transaction sharing fix. 2018-08-15 12:33:10 +12:00
Brendon Duncan
8dd573624d View change for previous fix. 2018-08-15 12:31:03 +12:00
Sebastiaan Pasma
99d8de02da
Show pasted address instead of always cashaddr format on bch 2018-08-14 15:53:18 +02:00
Sebastiaan Pasma
448679d1a6
receive tab not showing fiat amount on receiving amount ("payment received" screen) 2018-08-14 14:05:22 +02:00
Jean-Baptiste Dominguez
8f2ce2ce12
Merge pull request #281 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-14 18:20:13 +09:00
Sebastiaan Pasma
abe71a8077
typo in template.pot 2018-08-14 10:27:27 +02:00
Jean-Baptiste Dominguez
f834f6783f
Merge pull request #280 from Bitcoin-com/wallet/task/541
Fix for building android release
2018-08-14 17:15:07 +09:00
Jean-Baptiste Dominguez
5a5d31d45d Fix for building android release 2018-08-14 17:13:44 +09:00
Jean-Baptiste Dominguez
a34520c2a9
Merge pull request #279 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-14 16:49:22 +09:00
Jean-Baptiste Dominguez
f18546b8d6
Update appConfig.json 2018-08-14 16:48:55 +09:00
Jean-Baptiste Dominguez
7541f65361
Merge pull request #278 from Bitcoin-com/wallet/dev
Wallet/dev
2018-08-14 16:41:53 +09:00
Jean-Baptiste Dominguez
4c93b26e54
Merge pull request #277 from Bitcoin-com/wallet/prod
Wallet/prod
2018-08-14 16:41:23 +09:00
Brendon Duncan
197ee9eeeb Fix for the Custom Amount screen now following the price display setting. 2018-08-14 17:24:17 +12:00
Brendon Duncan
05e204dec8 Changed the review controller to allow the transaction to be shared, once successful. 2018-08-14 16:58:13 +12:00
Brendon Duncan
9b5f4b3516 Merged latest changes.
# Conflicts:
#	src/js/controllers/review.controller.js
#	www/views/review.html
2018-08-14 16:15:05 +12:00
Brendon Duncan
cf6658c83a Removed $apply() inside $watch. 2018-08-14 14:48:07 +12:00
Brendon Duncan
058fc617bb Merged text changes. 2018-08-14 14:43:42 +12:00
Jean-Baptiste Dominguez
580912748a
Merge pull request #276 from Bitcoin-com/wallet/task/514
Upgrade text
2018-08-14 11:41:37 +09: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
f6a99f7f47
Merge branch 'wallet/sprint/20' into wallet/dev 2018-08-13 15:31:01 +02:00
Sebastiaan Pasma
14406f6bc4
template.pot fix 2018-08-13 15:28:22 +02:00
Sebastiaan Pasma
4591d4992e
Merge remote-tracking branch 'origin/wallet/dev' into wallet/prod 5.0-rc1 2018-08-13 14:34:33 +02:00
Sebastiaan Pasma
d2a1461a26
Merge remote-tracking branch 'origin/wallet/dev' into wallet/dev 2018-08-13 14:13:55 +02:00
Sebastiaan Pasma
f51542874b
small fix: minus before alternative currency 2018-08-13 14:12:36 +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
a648b69297
Merge pull request #275 from Bitcoin-com/wallet/dev
Wallet/dev
2018-08-13 16:15:38 +09:00
Jean-Baptiste Dominguez
1c38298bbf
Merge pull request #274 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-13 16:15:03 +09:00
Jean-Baptiste Dominguez
a1abf54b4a
Merge pull request #273 from Bitcoin-com/wallet/task/428
Wallet/task/428
2018-08-13 16:14:32 +09:00
Jean-Baptiste Dominguez
30230304b6 Fix height header 2018-08-13 16:13:29 +09:00
Jean-Baptiste Dominguez
f93797efc0
Merge pull request #272 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-13 16:10:29 +09:00
Jean-Baptiste Dominguez
1d62da34d7
Merge pull request #271 from Bitcoin-com/wallet/dev
Wallet/dev
2018-08-13 15:37:50 +09:00
Jean-Baptiste Dominguez
9c999d0cd6
Update appConfig.json 2018-08-13 15:35:26 +09:00
Jean-Baptiste Dominguez
b25879b251
Merge pull request #268 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-13 15:33:24 +09:00
Jean-Baptiste Dominguez
e27aa9a612
Merge pull request #267 from Bitcoin-com/wallet/task/427
Custom amount crypto decimal
2018-08-13 14:45:18 +09:00
Jean-Baptiste Dominguez
c54cb55c51 Custom amount crypto decimal 2018-08-13 14:44:07 +09:00
Jean-Baptiste Dominguez
08ff6f2a6c
Merge pull request #266 from Bitcoin-com/wallet/task/427
Manage the currency state
2018-08-13 14:14:34 +09:00
Jean-Baptiste Dominguez
52e1b5e811 Manage the currency state 2018-08-13 14:13:49 +09:00
Brendon Duncan
b7d2c3e05c Merged fixes to Wallet Details. 2018-08-13 17:00:32 +12:00
Brendon Duncan
0b71daf04d Removed previous fix as it is superceded by a better one. 2018-08-13 16:51:38 +12:00