Commit graph

1,588 commits

Author SHA1 Message Date
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
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
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
e2f06f39d3 hide button if amount < 0 2016-09-14 15:41:49 -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
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
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
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
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
Gustavo Maximiliano Cortez
d6601637f9
Adds gravatar 2016-09-13 17:39:01 -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
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
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
Gustavo Maximiliano Cortez
c90e58a958 Merge pull request #96 from cmgustavo/ref/design-25
Address book as a view (not modal)
2016-09-13 09:50:51 -03:00
Gustavo Maximiliano Cortez
9a7e274485
Fix tab-send 2016-09-12 18:04:56 -03:00
Gustavo Maximiliano Cortez
62433d8fb9
Fix link to add 2016-09-12 17:54:09 -03:00
Gabriel Bazán
50434d7ab6 code refactor 2016-09-12 16:53:12 -03:00
Javier
091ae73e2d show scan tips 2016-09-12 16:41:04 -03:00
Javier
3c353fdbcb show receive tips 2016-09-12 15:48:46 -03:00
Gabriel Bazán
d28c837fcf onboarding process details 2016-09-12 15:12:22 -03:00
Gustavo Maximiliano Cortez
0f4cdfbb32 Merge pull request #94 from JDonadio/fix/sweep-flag
Fix/sweep paper wallet
2016-09-12 14:02:53 -03:00
Jamal Jackson
576cf04138 completed second step in backup 2016-09-12 12:25:15 -04:00
Gustavo Maximiliano Cortez
32d99e3e36
Addressbook as a view (not modal) 2016-09-12 11:59:29 -03:00
Jamal Jackson
984c713a6d finish initial backup phrase view where phrase is shown to user 2016-09-12 10:14:06 -04:00
Jamal Jackson
91a216cf0d onboarding backup desktop stylings updates 2016-09-09 13:47:27 -04:00
Jamal Jackson
3af5405340 cleaned up backup warning view on iPhone5 2016-09-09 10:05:35 -04:00
Jamal Jackson
be927da487 fixed backup request view for iPhone5 size devices 2016-09-09 09:47:53 -04:00
Javier
e16e93e408 fix sweep paper wallet flag - fix sweep process 2016-09-08 19:50:18 -03:00