Commit graph

8,214 commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez
f8fddd2431
Fix topbar for mobile 2016-09-02 13:00:38 -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
Gustavo Maximiliano Cortez
ef181c0931 Merge pull request #45 from matiu/bug/txstatus2
Bug/txstatus2
2016-09-02 11:18:10 -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
4662b2fc92
add translate 2016-09-02 10:35:57 -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
Gustavo Maximiliano Cortez
dfb213d175 Merge pull request #38 from gabrielbazan7/fix/walletPref
fix update wallet settings
2016-09-02 10:05:10 -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
Matias Alejo Garcia
ebdc5c3563 Merge pull request #43 from jamal-jackson/feature/onboarding_wallet_created_security
Onboarding wallet created and security
2016-09-02 08:34:07 -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
080cf11296 Merge pull request #41 from JDonadio/bug/bws-url
Fix set bws url by default
2016-09-01 18:16:53 -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
Javier
3818c783a0 set bws url by default 2016-09-01 16:58:24 -03:00
Matias Alejo Garcia
dd98e5375a
rm log 2016-09-01 16:58:05 -03:00
Matias Alejo Garcia
f5127d157c
better views in activity 2016-09-01 16:56:35 -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
Matias Alejo Garcia
1f1007a552 Merge pull request #36 from nacardin/feature/topBarColor
remove ionic css task from gruntfile
2016-09-01 16:09:36 -03:00
Gabriel Bazán
3c9303ab29 fixes 2016-09-01 16:08:41 -03:00
Nick Cardin
8dd14aa1b1 remove ionic css task from gruntfile 2016-09-01 15:06:26 -04: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
Matias Alejo Garcia
edbab551b6 Merge pull request #34 from nacardin/feature/topBarColor
Update headers and colors across app
2016-09-01 15:44:31 -03:00
Nick Cardin
a2052b3f3a clean up merge 2016-09-01 12:46:25 -04:00
Nick Cardin
8e6cd5ffba update header color and back button for settings 2016-09-01 12:36:59 -04:00
Nick Cardin
e63cb569ba standardize back buttons 2016-09-01 12:16:28 -04:00
Nick Cardin
bd7b7d1a77 indent 2016-09-01 11:53:55 -04:00
Nick Cardin
997f57e6d6 revert onboarding 2016-09-01 11:50:30 -04: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
Matias Alejo Garcia
64e43646d7 Merge pull request #33 from jamal-jackson/feature/get_started_tour
Get started tour for onboarding process
2016-09-01 11:30:52 -03:00
Jamal Jackson
4a793682e6 removed bitpay-wallet file 2016-09-01 10:27:06 -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