Commit graph

11,987 commits

Author SHA1 Message Date
Sebastiaan Pasma
6c6d90ebfe Cleaner way without redundant code 2018-06-05 11:15:33 +02:00
Sebastiaan Pasma
1e1f5deb2a iOS 9.3 fix 2018-06-04 21:37:36 +02:00
Sebastiaan Pasma
ddbc969de2 Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17 2018-06-04 21:04:02 +02:00
Jean-Baptiste Dominguez
437bd77ba4
Merge pull request #153 from Bitcoin-com/wallet/task/358
Improvement - 358 - Workflow camera permission
2018-06-04 14:30:52 +09:00
Sebastiaan Pasma
edc398015a
Merge branch 'wallet/sprint/17' into wallet/task/358 2018-05-28 13:55:31 +02:00
Sebastiaan Pasma
4c4c213786 Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17
# Conflicts:
#	src/js/controllers/tab-scan.js
2018-05-28 13:48:26 +02:00
Sebastiaan Pasma
a0b0f1a30b Check if permission has been granted, if so, activate the camera 2018-05-28 10:52:31 +02:00
Jean-Baptiste Dominguez
63c76fe13e Update version and show rc-beta 2018-05-25 18:15:02 +09:00
Jean-Baptiste Dominguez
e9e3ee7ddc
Merge pull request #147 from Bitcoin-com/wallet/sprint/16
Wallet/sprint/16
2018-05-25 14:13:56 +09:00
Sam Cheng Hung
7588307f77
Merge pull request #146 from Bitcoin-com/wallet/task/356
Fix - 356 - Remove vibration
2018-05-25 11:37:43 +08:00
Jean-Baptiste Dominguez
2e7d1c2cc8 Fix - 356 - Remove vibration 2018-05-25 12:14:49 +09:00
Jean-Baptiste Dominguez
ae38e6efbf
Merge pull request #144 from Bitcoin-com/wallet/task/357
Wallet/task/357
2018-05-25 11:55:36 +09:00
Jean-Baptiste Dominguez
706ba298fb
Merge pull request #145 from Bitcoin-com/wallet/task/319
Wallet/task/319
2018-05-25 11:50:30 +09:00
Jean-Baptiste Dominguez
16550d3b9a
Remove parenthesis 2018-05-25 11:50:00 +09:00
Jean-Baptiste Dominguez
a1e321a764
Remove parenthesis 2018-05-25 11:49:34 +09:00
Jean-Baptiste Dominguez
9f1223fd94
Remove console.log 2018-05-25 11:40:57 +09:00
Brendon Duncan
576bb2098a Moved the fix for reading the QR code higher up the call stack, so it would only be used when needed. 2018-05-24 18:56:05 -07:00
Brendon Duncan
6ec9a3af68 Fix for reading QR code. 2018-05-24 18:43:14 -07:00
Brendon Duncan
e7e578f20c Manually reversing 2 commits. 2018-05-24 18:36:20 -07:00
Brendon Duncan
c3347931ef The wallet list in the Confirm screen nows displays balances according to the Price Display setting. 2018-05-24 15:54:47 -07:00
Brendon Duncan
e0511ccb53 Dislaying fiat amounts in Send tab, according to Price Display setting. 2018-05-24 15:29:59 -07:00
Brendon Duncan
05a8952f87 Displaying fiat amounts in wallet selector in Receive tab. 2018-05-24 14:36:51 -07:00
Brendon Duncan
e5734cf083 Wallet balance display on the Receive tab now adheres to the Price Display setting. 2018-05-24 11:54:58 -07:00
Jean-Baptiste Dominguez
e6da8056da
Merge pull request #141 from Bitcoin-com/wallet/task/347
Adds faucet link
2018-05-24 21:39:02 +09:00
Sam Cheng Hung
170a7f9c6e
Merge pull request #142 from Bitcoin-com/wallet/task/346
Fix - 346 - Move the card bitcoin store
2018-05-24 16:38:45 +08:00
Sam Cheng Hung
73944ea126 Moves faucet link to the bottom, update buy.bitcoin.com icon style 2018-05-24 16:35:37 +08:00
Jean-Baptiste Dominguez
6f4302e0f7 Fix - 346 - Move the card bitcoin store 2018-05-24 17:33:03 +09:00
Sam Cheng Hung
e03aab0962 Adds faucet link 2018-05-24 14:57:34 +08:00
Jean-Baptiste Dominguez
f87c43de20
Merge pull request #139 from Bitcoin-com/wallet/task/355
Improvement - 355 - Use External Link Service
2018-05-24 14:41:32 +09:00
Jean-Baptiste Dominguez
8f5f01eea1
Merge pull request #137 from Bitcoin-com/wallet/task/346
Store banner on Home tab
2018-05-24 12:10:12 +09:00
Brendon Duncan
429e9c8446 In Recent Transactions it displays the crypto amount if the fiat display setting is selected but the fiat amount is not ready yet. 2018-05-23 18:04:42 -07:00
Sebastiaan Pasma
7643ea02cb Use External Link Service 2018-05-23 11:35:19 +02:00
Sebastiaan Pasma
af5a843e8a Use externalLinkService 2018-05-23 11:16:10 +02:00
Jean-Baptiste Dominguez
a0462a1e1e
Merge pull request #136 from davidshares/master 4.11-beta1
Fixing two links
2018-05-23 14:54:20 +09:00
Sam Cheng Hung
c83a9be4d8
Merge pull request #132 from Bitcoin-com/wallet/task/349
Improvement - 349 - Change text
2018-05-23 13:47:08 +08:00
Jean-Baptiste Dominguez
2906179632
Merge pull request #138 from Bitcoin-com/wallet/task/347
Updated Explore, Services and Community icon styles
2018-05-23 14:41:58 +09:00
Jean-Baptiste Dominguez
4319bfa82a
Merge pull request #134 from Bitcoin-com/wallet/task/348
Bug - 348 - Tapping ↻ on the "Wallet Service URL" screen will change it to a wrong URL.
2018-05-23 12:49:57 +09:00
Sam Cheng Hung
dfbbb3203d Updated Explore, Services and Community icon styles 2018-05-23 10:44:03 +08:00
Brendon Duncan
e4d5100753 Initial change for displaying fiat in "Recent Transactions". Does not yet display loading UI. 2018-05-22 19:29:57 -07:00
Sebastiaan Pasma
082686def6 346 - Bitcoin.com Store banner on Home tab 2018-05-22 17:43:12 +02:00
David Shares
0dc41bd5a5
Fixing link 2018-05-22 11:16:37 -04:00
David Shares
fa17d64391
Fixing link 2018-05-22 11:14:44 -04:00
Jean-Baptiste Dominguez
faa4038f9d
Merge pull request #126 from Bitcoin-com/wallet/task/332
Wallet/task/332
2018-05-22 18:30:52 +09:00
Jean-Baptiste Dominguez
8930f9a53a Fix - 332 - Fix the both script. 2018-05-22 17:23:03 +09:00
Sebastiaan Pasma
6eaf243e6e Also fixed for aliases 'prod' and 'production' 2018-05-22 09:54:56 +02:00
Sebastiaan Pasma
4e83d09f47 Bug - 348 - Tapping ↻ on the "Wallet Service URL" screen will change it to a wrong URL. 2018-05-22 09:43:39 +02:00
Jean-Baptiste Dominguez
953a465606
Merge pull request #131 from Bitcoin-com/wallet/task/324
Wallet/task/324
2018-05-22 12:16:41 +09:00
Sam Cheng Hung
68a6e04224
Merge pull request #130 from Bitcoin-com/wallet/task/339
Improvement - 339 - "Payment received" screen is skipped after first transaction
2018-05-22 10:40:04 +08:00
Jean-Baptiste Dominguez
c5ae87e898 Fix - 339 - receive is executed by an event out of angular, apply. 2018-05-22 11:27:10 +09:00
Brendon Duncan
789e557c4e Whitespace only change: Corrected the tab size to 2 spaces in tab-home.html. 2018-05-21 11:31:01 -07:00