Commit graph

8,432 commits

Author SHA1 Message Date
Nick Cardin
2bde795e15 update home tab icons 2016-09-15 13:51:23 -04:00
Gustavo Maximiliano Cortez
8e53b8100a Merge pull request #113 from jamal-jackson/feature/onboarding_screenshot_warning_model
Onboarding screenshot warning model
2016-09-15 11:22:06 -03: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
36539d75e8 Merge pull request #122 from cmgustavo/ref/design-33
v0.12.0
2016-09-15 10:15:43 -03:00
Gustavo Maximiliano Cortez
58b22fe803
v0.12.0 2016-09-15 10:14:43 -03: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
bb96f45488 Merge pull request #120 from JDonadio/fix/terms-of-use
Fix disclaimer link and overflow text
2016-09-15 10:10:31 -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
b7f0e403e5 Merge pull request #119 from cmgustavo/ref/design-31
v0.11.0
2016-09-14 17:57:38 -03:00
Gustavo Maximiliano Cortez
7caaf96307
v0.11.0 2016-09-14 17:56:58 -03:00
Gustavo Maximiliano Cortez
50197f8ce5 Merge pull request #118 from cmgustavo/ref/design-30
Fix no border for back buttons
2016-09-14 17:53:16 -03:00
Gustavo Maximiliano Cortez
90c9f69a9c
Fix no border for back buttons 2016-09-14 17:43:03 -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
e9a463aa34 Merge pull request #116 from gabrielbazan7/fix/amountSend
hide button if amount < 0
2016-09-14 17:01:49 -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
Gabriel Bazán
e2f06f39d3 hide button if amount < 0 2016-09-14 15:41:49 -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
Gustavo Maximiliano Cortez
1e0424ad29 Merge pull request #103 from jamal-jackson/feature/onboarding_backup_phrase
Added design and styling needed for backup phrase view
2016-09-14 15:15:33 -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
Gustavo Maximiliano Cortez
f7c19265d1 Merge pull request #108 from gabrielbazan7/feat/activityFilter
1 of X wallets should not produce proposals
2016-09-14 11:48:48 -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
Gustavo Maximiliano Cortez
3424894a11 Merge pull request #107 from gabrielbazan7/fix/importNewScss
import new scss
2016-09-14 10:36:25 -03:00
Gabriel Bazán
f007fb305d import new scss 2016-09-14 10:26:38 -03:00
Gustavo Maximiliano Cortez
d4b9fa99f2 Merge pull request #106 from gabrielbazan7/feat/avatarSendView
avatar in send view
2016-09-14 10:13:32 -03:00
Gustavo Maximiliano Cortez
9f88d9a3cb Merge pull request #105 from cmgustavo/ref/design-28
Fix Address book directive. Adds gravatar
2016-09-14 10:06:50 -03:00
Gustavo Maximiliano Cortez
c4411961af Merge pull request #104 from gabrielbazan7/fix/onboarding-02
Fix/onboarding 02
2016-09-14 10:06:30 -03:00
Gabriel Bazán
c21d447031 avatar in send view 2016-09-14 10:05:02 -03:00
Jamal Jackson
7308883010 Merge pull request #1 from JDonadio/jamal/backup-phrase
Fix backup flow
2016-09-14 08:34:38 -04:00