Commit graph

1,566 commits

Author SHA1 Message Date
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
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
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
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
Jamal Jackson
4af098764d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-08 15:42:47 -04:00
Jamal Jackson
d2b5a70d93 updated and fixed issues with collect email view styling, moved skip button to top right 2016-09-08 15:41:44 -04:00
Gustavo Maximiliano Cortez
fbe640004c Merge pull request #87 from JDonadio/fix/onboarding-checks
Open terms of service as a modal
2016-09-08 16:05:28 -03:00
Gustavo Maximiliano Cortez
708be4d3a3 Merge pull request #85 from isocolsky/feat/recreate
Recreate
2016-09-08 15:55:47 -03:00
Jason Dreyzehner
dbf2bf93e9 Merge branch 'feature/send' of github.com:nacardin/bitpay-wallet into nacardin-feature/send 2016-09-08 14:25:58 -04:00
Gustavo Maximiliano Cortez
a9bcd9ebac Merge pull request #84 from JDonadio/feat/separate-create-tabs
Separate create tab views
2016-09-08 15:14:05 -03:00
Gustavo Maximiliano Cortez
eb92820bce Merge pull request #81 from jamal-jackson/feature/onboarding_last_steps
added height breakpoint for disclaimer view agree to terms modal to m…
2016-09-08 15:13:25 -03:00
Gustavo Maximiliano Cortez
112d30d3e6 Merge pull request #78 from jamal-jackson/feature/recieve_bitcoin_views
Initial setup of receive tab(waiting on some designs/views to be made)
2016-09-08 15:13:15 -03:00
Javier
ff44eb3879 open terms of use as a modal 2016-09-08 14:54:32 -03:00
Nick Cardin
7e29b9eb98 send view first pass 2016-09-08 11:36:08 -04:00
Ivan Socolsky
d0d4f85c59
allow recreate 2016-09-08 12:16:51 -03:00
Jamal Jackson
57c1942740 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-08 10:33:21 -04:00
Javier
967fdff063 separate create tab views 2016-09-08 11:32:48 -03:00
Jamal Jackson
b99bfd1cbd polished responsiveness of welcome view 2016-09-08 10:17:34 -04:00
Gustavo Maximiliano Cortez
d6d54a4e35 Merge pull request #83 from gabrielbazan7/feat/copySecret
copy secret to clipboard
2016-09-07 17:05:03 -03:00
Gabriel Bazán
12b2f06591 copy secret to clipboard 2016-09-07 17:03:21 -03:00
Jamal Jackson
fefdc0de93 fixed full screen positioning issue with qr code 2016-09-07 15:09:53 -04:00
Gustavo Maximiliano Cortez
413c1fc8a3 Merge pull request #77 from JDonadio/fix/notifications
Fix notifications shown
2016-09-07 15:15:55 -03:00
Javier
afc898b386 fix notifications shown on recent activity view 2016-09-07 15:11:26 -03:00
Gustavo Maximiliano Cortez
0adc79b85e Merge pull request #74 from cmgustavo/ref/design-23
Fix modals tx, txp and search
2016-09-07 15:07:20 -03:00
Gustavo Maximiliano Cortez
f3e837a3a8 Merge pull request #65 from cmgustavo/ref/design-20
Fix bitpay card. Replaces the app-name in desktop
2016-09-07 15:06:55 -03:00
Gustavo Maximiliano Cortez
28a896c18f Merge pull request #72 from cmgustavo/ref/design-22
Fix button to skip onboarding-email
2016-09-07 15:01:38 -03:00