Commit Graph

1982 Commits

Author SHA1 Message Date
Matias Alejo Garcia 3b2b7358b8 Merge pull request #49 from gabrielbazan7/fix/searchTx
fix UI search transactions
2016-09-02 15:01:32 -03:00
Matias Alejo Garcia 3ee06cdab9 Merge pull request #51 from gabrielbazan7/fix/txDetails
fix transations details note and external link
2016-09-02 15:01:10 -03:00
Gabriel Bazán 2bdf4021d2 fix transations details note and external link 2016-09-02 14:51:41 -03:00
Gabriel Bazán 9c024aebf6 fix UI search transactions 2016-09-02 14:29:34 -03:00
Matias Alejo Garcia 73ac243ce0 Merge pull request #48 from gabrielbazan7/fix/prefHistory
fix error on preferences history when there is no transactions
2016-09-02 13:56:14 -03:00
Gabriel Bazán 9e810466b7 fix preferences history 2016-09-02 12:36:51 -03:00
Gustavo Maximiliano Cortez 95e29aed9a Merge pull request #46 from gabrielbazan7/fix/onboardingBackup
Fix onboarding backup route, mail and params refactor
2016-09-02 11:55:12 -03:00
Gabriel Bazán 0a5efb4930 remove params from the url 2016-09-02 11:20:33 -03:00
Gabriel Bazán 314532c62a fix email onboarding 2016-09-02 11:15:03 -03:00
Gabriel Bazán 3a933959c1 fix onboarding backup confirm and routes 2016-09-02 11:12:30 -03:00
Matias Alejo Garcia a95f37ce54
fix txStatus modal 2016-09-02 10:35:57 -03:00
Matias Alejo Garcia e286e7ea56 Merge pull request #42 from bitpay/feat/txp-at-home
Feat/txp at home
2016-09-02 10:31:46 -03:00
Gabriel Bazán 33ba69cfec fixes 2016-09-02 09:54:47 -03:00
Gabriel Bazán 3c0bc734a4 fix email label 2016-09-02 09:52:59 -03:00
Gabriel Bazán d911dd9d0b fix update wallet settings 2016-09-02 09:52:59 -03:00
Jamal Jackson cc72e06f43 updated arrow icon, removed border in header 2016-09-02 07:17:18 -04:00
Jamal Jackson ee7bb0f455 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_wallet_created
# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
2016-09-02 06:57:50 -04:00
Jamal Jackson c4d159ca1f success and backup views and styles 2016-09-02 06:50:23 -04:00
Matias Alejo Garcia b9ebe65c9b
txp at home 2016-09-01 19:14:18 -03:00
Matias Alejo Garcia f6f4a3fb28 Merge pull request #40 from cmgustavo/ref/design-14
Glidera service
2016-09-01 18:30:28 -03:00
Gustavo Maximiliano Cortez 7e2d3e74b2 Merge pull request #39 from bitpay/bug/fingerprint
Bug/fingerprint
2016-09-01 18:15:54 -03:00
Gustavo Maximiliano Cortez d856ef99b8 Merge pull request #35 from gabrielbazan7/feat/QrOnboarding
Qr - remove main tabs from import view (onboarding)
2016-09-01 17:50:31 -03:00
Matias Alejo Garcia b90e06dd4c
txps1 2016-09-01 17:41:00 -03:00
Matias Alejo Garcia dd98e5375a
rm log 2016-09-01 16:58:05 -03:00
Gustavo Maximiliano Cortez 792c20b040
Glidera service 2016-09-01 16:51:29 -03:00
Matias Alejo Garcia e0b77968bd
disable grouping in activity 2016-09-01 16:50:13 -03:00
Matias Alejo Garcia 333b4f45a0
fix fingerprint setting, remove activity from home 2016-09-01 16:46:49 -03:00
Matias Alejo Garcia 21c5cd3fd7 Merge pull request #37 from nacardin/feature/walletDetails
update walletDetails header styles
2016-09-01 16:46:07 -03:00
Nick Cardin 70db673855 update walletDetails header styles 2016-09-01 15:25:03 -04:00
Gabriel Bazán 3c9303ab29 fixes 2016-09-01 16:08:41 -03:00
Gabriel Bazán d5ef1e071d import refactor 2016-09-01 16:04:58 -03:00
Gabriel Bazán 657c2b830c remove main tabs from import view in onboarding flow 2016-09-01 16:04:58 -03:00
Gabriel Bazán d25a5dfb1b adding from onboarding state param 2016-09-01 16:04:58 -03:00
Gabriel Bazán 7835694fb2 import with Qr in onboarding 2016-09-01 16:04:58 -03:00
Matias Alejo Garcia fd8f76bab0 Merge pull request #32 from cmgustavo/ref/design-12
Removes msg error by popupService
2016-09-01 15:44:56 -03:00
Nick Cardin 3a771e0e21 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/topBarColor 2016-09-01 11:40:43 -04:00
Jamal Jackson a6a0742c90 set up initial success screen and added animation for collecting email form 2016-09-01 11:24:52 -04:00
Jamal Jackson 7a7b78d03b Merge branch 'feature/get_started_tour' of https://github.com/jamal-jackson/bitpay-wallet into feature/onboarding_wallet_created 2016-09-01 10:15:39 -04:00
Jamal Jackson 1caf875ad1 Merge branch 'ref/design' of https://github.com/jamal-jackson/bitpay-wallet into feature/get_started_tour
# Conflicts:
#	public/views/onboarding/welcome.html
2016-09-01 10:12:35 -04:00
Gustavo Maximiliano Cortez 50fdeff138
Removes function showAlert 2016-09-01 11:11:40 -03:00
Gustavo Maximiliano Cortez 92bb8e01bc
Uses popupService 2016-09-01 11:00:36 -03:00
Matias Alejo Garcia 65e1f2dd50
fix respore 2016-09-01 10:37:02 -03:00
Jamal Jackson 38282f181e added collect email styling, updated create default wallet action on tour.html 2016-09-01 09:25:57 -04:00
Jamal Jackson 8485b62df1 fixed header style issue on tour 2016-09-01 09:02:28 -04:00
Jamal Jackson f15d597b25 pulled in latest commits from yesterday, merged and handled conflicts 2016-09-01 08:59:37 -04:00
Jamal Jackson e3634f63d1 finished on boarding tour ui improvements, started on wallet create 2016-09-01 08:51:48 -04:00
Matias Alejo Garcia 9fef8f0e90
route fix 2016-08-31 21:01:00 -03:00
Matias Alejo Garcia 208f248c32 Merge pull request #27 from cmgustavo/ref/design-10
Fix path to walletDetails
2016-08-31 19:21:01 -03:00
Gustavo Maximiliano Cortez bb195e0742
Fix path to walletDetails 2016-08-31 19:07:07 -03:00
Nick Cardin 8d762b380b standardize buttons and bar color 2016-08-31 18:02:15 -04:00