Commit graph

12,647 commits

Author SHA1 Message Date
Brendon Duncan
8908b5ef80 Send max button behaviour is now conditional based on min and max limits. 2018-09-03 20:12:20 +12:00
Jean-Baptiste Dominguez
4deeb80a14
Merge pull request #303 from Bitcoin-com/wallet/dev
Wallet/dev
2018-08-26 22:16:46 +09:00
Jean-Baptiste Dominguez
0a4054707f
Merge pull request #302 from Bitcoin-com/wallet/prod
Wallet/prod
2018-08-26 22:07:20 +09:00
Jean-Baptiste Dominguez
07ff264619
Merge pull request #297 from Bitcoin-com/wallet/dev 5.0-rc3
Wallet/dev
2018-08-23 14:40:54 +09:00
Jean-Baptiste Dominguez
dd4fcc9ed1
Update appConfig.json 2018-08-23 14:40:18 +09:00
Jean-Baptiste Dominguez
7e0998c919
Merge pull request #296 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-23 14:39:47 +09:00
Jean-Baptiste Dominguez
a2009a2f06
Merge pull request #295 from Bitcoin-com/wallet/task/503
Tweak strings to match translations.
2018-08-23 14:39:23 +09:00
Brendon Duncan
39bcb9daae Tweak strings to match translations. 2018-08-23 16:21:15 +12:00
Jean-Baptiste Dominguez
66e643f903
Merge pull request #291 from Bitcoin-com/wallet/dev 5.0-rc2
Wallet/dev
2018-08-21 12:46:38 +09:00
Jean-Baptiste Dominguez
feb41adc58 Upgrade the version 2018-08-21 10:44:38 +07:00
Jean-Baptiste Dominguez
ef6b52c6e9 translation 2018-08-21 10:42:12 +07:00
Jean-Baptiste Dominguez
b0f9cb43d6
Merge pull request #289 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-18 02:03:55 +09:00
Jean-Baptiste Dominguez
d06e9f7088
Update package-template.json 2018-08-18 02:03:23 +09:00
Jean-Baptiste Dominguez
f4346fd921
Update bower.json 2018-08-18 02:02:50 +09:00
Jean-Baptiste Dominguez
1fcab222c5
Merge pull request #288 from Bitcoin-com/wallet/sprint/20
Update package.json
2018-08-18 01:29:46 +09:00
Jean-Baptiste Dominguez
154e495846
Update package.json 2018-08-18 01:29:04 +09:00
Jean-Baptiste Dominguez
8f356f8d75
Merge pull request #287 from Bitcoin-com/wallet/sprint/20
ionic resolution
2018-08-18 01:18:34 +09:00
Jean-Baptiste Dominguez
6dcc221ee1 ionic resolution 2018-08-18 01:17:04 +09:00
Jean-Baptiste Dominguez
1e2cfd3ae4
Merge pull request #286 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-18 00:53:18 +09:00
Jean-Baptiste Dominguez
3cef258912 Merge branch 'wallet/sprint/20' of https://github.com/Bitcoin-com/Wallet into wallet/sprint/20 2018-08-18 00:51:24 +09:00
Jean-Baptiste Dominguez
a67f9acbc6 Resolution package 2018-08-18 00:51:08 +09:00
Brendon Duncan
9ee9e8fbed Merged quick fix for asn1. 2018-08-17 16:58:10 +12:00
Brendon Duncan
26891f6e47 Cleaned up log message. 2018-08-17 16:54:04 +12:00
Brendon Duncan
b3e34483b6 Show my address button. 2018-08-17 11:59:27 +12:00
Brendon Duncan
aa75ba18d6 Removed old content. 2018-08-17 11:45:43 +12:00
Jean-Baptiste Dominguez
eee1a69d84
Update package.json 2018-08-16 17:54:51 +09:00
Jean-Baptiste Dominguez
e8f7126c89 package.json 2018-08-16 17:52:23 +09:00
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
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