Commit graph

2,145 commits

Author SHA1 Message Date
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
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
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
Jamal Jackson
2a55e3f232 backup view when header is present fixes 2016-09-14 08:29:57 -04:00
Gabriel Bazán
8080e0b856 fix skip button on email view 2016-09-13 23:25:50 -03:00
Javier
da5b7d6aff clean unused services 2016-09-13 17:51:05 -03:00
Javier
88c9e48ad9 fix title 2016-09-13 17:49:07 -03:00
Gustavo Maximiliano Cortez
d6601637f9
Adds gravatar 2016-09-13 17:39:01 -03:00
Gabriel Bazán
431058baec fix save last state 2016-09-13 17:31:29 -03:00
Gabriel Bazán
a8567eabb4 fixes 2016-09-13 17:13:53 -03:00
Gabriel Bazán
3d927267bc onboarding - disable scroll - skip notification view on android 2016-09-13 17:12:17 -03:00
Javier
a978062425 fix backup flow 2016-09-13 17:02:38 -03:00
Jamal Jackson
4a1ea6d3ea updating on boarding button classes on tour page 2016-09-13 15:55:08 -04:00
Jamal Jackson
390a7deecf finish adding styles for push notifications view(initial testing for iPhone5 size devices only) 2016-09-13 15:45:56 -04:00
Jamal Jackson
ee046cde4e increased modal backdrop opacity with what found in zeplin 2016-09-13 14:35:27 -04:00
Jamal Jackson
d39f69531d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase
# Conflicts:
#	public/views/includes/confirmBackupPopup.html
#	src/js/controllers/backup.js
2016-09-13 14:26:25 -04:00
Jamal Jackson
13c56798fe updated language and position on confirm on backup file 2016-09-13 14:15:51 -04:00
Jamal Jackson
8b24adb53c added basic modal class styling, styled success modal 2016-09-13 14:05:49 -04:00
Gustavo Maximiliano Cortez
32a9c208b7
Fix addressbook directive 2016-09-13 11:12:18 -03:00
Gustavo Maximiliano Cortez
058f790ebd Merge pull request #99 from gabrielbazan7/ref/code
code refactor
2016-09-13 09:55:26 -03:00
Gustavo Maximiliano Cortez
1e628d9704 Merge pull request #97 from JDonadio/feat/tips
First-tips
2016-09-13 09:54:43 -03:00