Commit graph

2,520 commits

Author SHA1 Message Date
Jamal Jackson
6a9db7de1d fix general iOS and other device position issues on backup view 2016-09-16 15:36:50 -04:00
Gustavo Maximiliano Cortez
2f547520b4
Fix Amazon routes 2016-09-16 16:25:45 -03:00
Gustavo Maximiliano Cortez
5bd450270b Merge pull request #130 from cmgustavo/ref/design-34
Glidera route issues
2016-09-16 14:59:41 -03:00
Gustavo Maximiliano Cortez
8a2db79345 Merge pull request #129 from gabrielbazan7/feat/NewsEmail
Feat/news email
2016-09-16 14:59:25 -03:00
Gustavo Maximiliano Cortez
cbaa5d6266 Merge pull request #128 from jamal-jackson/feature/iPhone_6_fixes
iPhone 6 fixes
2016-09-16 14:58:16 -03:00
Gustavo Maximiliano Cortez
24133452f0 Merge pull request #127 from gabrielbazan7/fix/detailsNavBar
add ion nav bar in wallet details view
2016-09-16 14:57:52 -03:00
Gustavo Maximiliano Cortez
bcb6f97385
Fix Glidera routes 2016-09-16 14:46:25 -03:00
Gabriel Bazán
a8f6b3c27d add news and updates checkbox in onboarding 2016-09-16 14:40:55 -03:00
Jamal Jackson
417e82c238 fixed backup warning cat position, request header image height 2016-09-16 12:15:12 -04:00
Gabriel Bazán
51bec11127 add ion nav bar in wallet details view 2016-09-16 11:30:16 -03:00
Jamal Jackson
7afa277178 fix welcome view background, added margin to disclaimer h3, added direction to scroll on terms view 2016-09-16 10:07:50 -04:00
Jamal Jackson
75c04a7400 fix on boarding collect email check image height 2016-09-16 09:33:50 -04:00
Jamal Jackson
379015cad5 fix backup cta button and screenshot warning view cta button positions 2016-09-15 15:41:12 -04:00
Gustavo Maximiliano Cortez
1998d78b4a Merge pull request #124 from nacardin/feature/send2
update tab-home view
2016-09-15 15:03:17 -03:00
Nick Cardin
df824695de add padding to next steps 2016-09-15 13:58:50 -04:00
Nick Cardin
2bde795e15 update home tab icons 2016-09-15 13:51:23 -04:00
Jamal Jackson
5ad94a8579 fix terms page back button to arrow and not text 2016-09-15 10:47:10 -04:00
Jamal Jackson
a17ae9cf6a Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/terms_of_use_updates 2016-09-15 10:35:56 -04:00
Jamal Jackson
ab8e54d2f7 fix for backup view when loaded from settings tab 2016-09-15 10:22:12 -04:00
Jamal Jackson
c2307d5dcd fix terms checkbox top being cutoff issue 2016-09-15 10:15:55 -04:00
Jamal Jackson
be58b7983d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_screenshot_warning_model 2016-09-15 09:37:36 -04:00
Gustavo Maximiliano Cortez
e2e8d1aaf4 Merge pull request #121 from cmgustavo/ref/design-32
Fix tips
2016-09-15 10:10:40 -03:00
Gustavo Maximiliano Cortez
2230d5b666
Fix tips 2016-09-15 09:58:57 -03:00
Javier
a06292f733 fix disclaimer link and overflow text 2016-09-14 18:04:44 -03:00
Gustavo Maximiliano Cortez
3c45cc368d Merge pull request #117 from jamal-jackson/feature/tab_icons
updated tab icons
2016-09-14 17:02:22 -03:00
Gustavo Maximiliano Cortez
a85ef7e46d Merge pull request #115 from jamal-jackson/feature/onboarding_backup_phrase
fix css differences with new merge
2016-09-14 17:01:36 -03:00
Gustavo Maximiliano Cortez
805a4fcef2 Merge pull request #112 from jamal-jackson/feature/onboarding_push_notifications
Finished onboarding notifications view
2016-09-14 17:00:54 -03:00
Jamal Jackson
c1681ad24c removed unneeded wallet tab icon declaration 2016-09-14 15:38:35 -04:00
Gustavo Maximiliano Cortez
07f3a28a99 Merge pull request #114 from gabrielbazan7/fix/backup
Fix/backup
2016-09-14 16:36:59 -03:00
Gustavo Maximiliano Cortez
cd6d0a5d1d Merge pull request #111 from cmgustavo/ref/design-29
Amazon: not allow to buy gift card for amounts with more than 2 decim…
2016-09-14 16:36:37 -03:00
Jamal Jackson
516e628d2d updated tab icons 2016-09-14 15:08:19 -04:00
Jamal Jackson
30f8a641b1 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications 2016-09-14 14:46:23 -04:00
Gabriel Bazán
306577c697 delete unused dependency 2016-09-14 15:44:28 -03:00
Jamal Jackson
b5292be030 fix css differences with new merge 2016-09-14 14:39:13 -04:00
Gabriel Bazán
a2922e0d5e prevent default in onboarding views with no back 2016-09-14 15:31:38 -03:00
Gabriel Bazán
c3e471a525 fix back routes on backup view when resume 2016-09-14 15:31:38 -03:00
Jamal Jackson
d38a3a01be added screenshot model 2016-09-14 14:07:44 -04:00
Jamal Jackson
a20802b3c5 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase 2016-09-14 12:58:25 -04:00
Jamal Jackson
fdb5e467b9 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications
# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
2016-09-14 11:42:33 -04:00
Jamal Jackson
df30370e67 removed cat margin bottom at certain height 2016-09-14 11:40:04 -04:00
Gustavo Maximiliano Cortez
a8f212474a
Amazon: not allow to buy gift card for amounts with more than 2 decimal places. Adds a confirmation before to purchase 2016-09-14 12:39:27 -03:00
Jamal Jackson
ca6b6c058b removed overflow-y hidden when elect-phrase element is relative 2016-09-14 11:26:00 -04:00
Gustavo Maximiliano Cortez
e8c242992a Merge pull request #110 from gabrielbazan7/feat/lockOrientation
lock orientation when screen width < 768
2016-09-14 11:50:20 -03:00
Gustavo Maximiliano Cortez
a1fe2d4a69 Merge pull request #109 from isocolsky/fix/wallet-filter
Filter out unavailable wallets
2016-09-14 11:49:17 -03:00
Jamal Jackson
31d5a370bd Merge branch 'feature/onboarding_backup_phrase' of https://github.com/jamal-jackson/bitpay-wallet into feature/onboarding_backup_phrase 2016-09-14 10:40:53 -04:00
Jamal Jackson
fe96fc41d1 updated text for different scenarios where backup phrase might not be readily available to create. 2016-09-14 10:40:33 -04:00
Gabriel Bazán
d6e78b00f7 lock orientation when screen width < 768 2016-09-14 11:20:49 -03:00
Gabriel Bazán
caeac6045c fixes 2016-09-14 11:18:03 -03:00
Ivan Socolsky
e69ceffb59
filter unavailable wallets 2016-09-14 11:03:43 -03:00
Gabriel Bazán
2f8227ff27 1 of X wallets should not produce proposals 2016-09-14 11:00:59 -03:00