Commit graph

1,433 commits

Author SHA1 Message Date
Javier
4b2e72a28f fix empty object - navigate to home 2016-09-02 16:42:14 -03:00
Gustavo Maximiliano Cortez
e4e388f7bd Merge pull request #50 from matiu/bug/sign2
Bug/sign2
2016-09-02 16:21:26 -03:00
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
Matias Alejo Garcia
8c43f55756
add notpending in proposals 2016-09-02 14:33:18 -03:00
Gabriel Bazán
9c024aebf6 fix UI search transactions 2016-09-02 14:29:34 -03:00
Matias Alejo Garcia
d7e025c2d0
better tx create at confirm 2016-09-02 14:18:00 -03:00
Matias Alejo Garcia
0ed46f1f65
fix About 2016-09-02 14:18:00 -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
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
Javier
3818c783a0 set bws url by default 2016-09-01 16:58:24 -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
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
657c2b830c remove main tabs from import view in onboarding flow 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
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
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
92bb8e01bc
Uses popupService 2016-09-01 11:00:36 -03:00
Matias Alejo Garcia
546891d69c Merge pull request #31 from gabrielbazan7/fix/translations
translations
2016-09-01 10:50:24 -03:00
Gabriel Bazán
91d1b16508 translations 2016-09-01 10:41:23 -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
e935ea64e8 updated create wallet method 2016-09-01 09:25:19 -04:00
Jamal Jackson
f15d597b25 pulled in latest commits from yesterday, merged and handled conflicts 2016-09-01 08:59:37 -04:00
Gustavo Maximiliano Cortez
9d341a2cd9
Missing ion-view element and bar-stable class for topbar 2016-09-01 09:53:17 -03: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
1e5c940ef7
wallet created 2016-08-31 20:10:13 -03:00
Nick Cardin
8d762b380b standardize buttons and bar color 2016-08-31 18:02:15 -04:00