Commit Graph

1610 Commits

Author SHA1 Message Date
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
Jamal Jackson b0c5fc22db added help circle and tip modal 2016-09-07 13:49:08 -04:00
Gustavo Maximiliano Cortez a735a3d0eb Merge pull request #73 from JDonadio/fix/tabs-export
Fix/tabs export
2016-09-07 13:41:05 -03:00
Gustavo Maximiliano Cortez 040b2e6627
Fix modals tx, txp and search 2016-09-07 13:34:47 -03:00
Javier dd9e48df14 complete export process 2016-09-07 12:23:09 -03:00
Gustavo Maximiliano Cortez 7dae3c7034 Merge pull request #66 from JDonadio/fix/tabs-import
Fix/tabs import
2016-09-07 11:02:44 -03:00
Gustavo Maximiliano Cortez 42a8eaa119
Fix button to skip onboarding-email 2016-09-07 10:49:47 -03:00
Jamal Jackson 21a2f41ef9 began update for wallet module and receive screen 2016-09-07 09:46:00 -04:00
Matias Alejo Garcia 6485cd1bdf Merge pull request #70 from cmgustavo/ref/design-21
Fix openExtenalLink
2016-09-07 10:28:47 -03:00
Gustavo Maximiliano Cortez 1d6fe3d59e
Fix openExtenalLink 2016-09-07 10:25:27 -03:00
Nick Cardin 6b19189caa update nav link css 2016-09-06 17:58:04 -04:00
Nick Cardin cab4534797 update link items 2016-09-06 17:53:20 -04:00
Javier 9632fe8b64 complete import process 2016-09-06 17:09:05 -03:00
Javier f2257f2519 import from phrase and text done 2016-09-06 15:30:50 -03:00
Gustavo Maximiliano Cortez da4945cc15 Merge pull request #61 from JDonadio/fix/wallet-incomplete
Fix incomplete wallet process
2016-09-06 15:19:30 -03:00
Gustavo Maximiliano Cortez 6f7ab548be Merge pull request #62 from jamal-jackson/feature/onboarding_last_steps
Onboarding disclaimer steps
2016-09-06 15:18:54 -03:00
Gustavo Maximiliano Cortez 5e03f803de
Fix bitpay card. Replaces the app-name in desktop 2016-09-06 15:14:07 -03:00
Matias Alejo Garcia 572025527c Merge pull request #63 from cmgustavo/ref/design-18
Fix glidera issues (tx proposals and ui)
2016-09-06 15:01:16 -03:00
Gustavo Maximiliano Cortez ee33e06697
Fix amazon buttons and forms 2016-09-06 12:44:46 -03:00
Jamal Jackson e74b70744f removed root prefix 2016-09-06 11:18:12 -04:00
Jamal Jackson 660f7cb6d3 removed duplicate translate 2016-09-06 11:16:53 -04:00
Gustavo Maximiliano Cortez 241213ca4f
Fix glidera issues (tx proposals and ui) 2016-09-06 11:59:05 -03:00
Jamal Jackson 229e2fd8ec Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps
# Conflicts:
#	public/views/onboarding/terms.html
#	src/sass/views/onboarding/terms-of-use.scss
2016-09-06 10:46:47 -04:00
Jamal Jackson 0ad4e390bb finished terms of use page 2016-09-06 10:43:54 -04:00
Javier b6bcc57cfd fix incomplete wallet process 2016-09-06 11:28:34 -03:00
Jamal Jackson a78724bcca setup disclaimer view and styles 2016-09-06 10:06:13 -04:00
Gustavo Maximiliano Cortez 2354a46bed Merge pull request #59 from JDonadio/fix/tabs-create
Fix/tabs create
2016-09-06 10:14:51 -03:00
Gustavo Maximiliano Cortez a1672e1e95
Fix fee level, preferences by wallet, delete, info 2016-09-05 17:36:11 -03:00
Javier 6ba7b7c655 complete scope data for create wallets 2016-09-05 17:15:23 -03:00
Gustavo Maximiliano Cortez a200d42bcd
Ref About 2016-09-05 14:59:11 -03:00
Javier 25990e23fe separate views 2016-09-05 14:34:32 -03:00
Gabriel Bazán 14da63c485 fix activity and proposals transitions 2016-09-05 11:04:40 -03:00
Matias Alejo Garcia 22c06c73a3 Merge pull request #53 from cmgustavo/ref/design-15
Ref/design 15
2016-09-02 17:01:44 -03:00
Javier 4b2e72a28f fix empty object - navigate to home 2016-09-02 16:42:14 -03:00
Gustavo Maximiliano Cortez e4e388f7bd Merge pull request #50 from matiu/bug/sign2
Bug/sign2
2016-09-02 16:21:26 -03:00
Gustavo Maximiliano Cortez e19d5dc254
onboarding email: fix scrolling when focus input 2016-09-02 15:55:43 -03:00
Gustavo Maximiliano Cortez 2fccd89c3a
Fix onboarding params, buttons, states 2016-09-02 15:42:45 -03:00
Matias Alejo Garcia 3b2b7358b8 Merge pull request #49 from gabrielbazan7/fix/searchTx
fix UI search transactions
2016-09-02 15:01:32 -03:00
Matias Alejo Garcia 3ee06cdab9 Merge pull request #51 from gabrielbazan7/fix/txDetails
fix transations details note and external link
2016-09-02 15:01:10 -03:00
Gabriel Bazán 2bdf4021d2 fix transations details note and external link 2016-09-02 14:51:41 -03:00
Matias Alejo Garcia 8c43f55756
add notpending in proposals 2016-09-02 14:33:18 -03:00
Gabriel Bazán 9c024aebf6 fix UI search transactions 2016-09-02 14:29:34 -03:00
Matias Alejo Garcia d7e025c2d0
better tx create at confirm 2016-09-02 14:18:00 -03:00
Matias Alejo Garcia 0ed46f1f65
fix About 2016-09-02 14:18:00 -03:00
Gustavo Maximiliano Cortez f8fddd2431
Fix topbar for mobile 2016-09-02 13:00:38 -03:00
Matias Alejo Garcia 4662b2fc92
add translate 2016-09-02 10:35:57 -03:00
Matias Alejo Garcia a95f37ce54
fix txStatus modal 2016-09-02 10:35:57 -03:00
Matias Alejo Garcia e286e7ea56 Merge pull request #42 from bitpay/feat/txp-at-home
Feat/txp at home
2016-09-02 10:31:46 -03:00
Jamal Jackson cc72e06f43 updated arrow icon, removed border in header 2016-09-02 07:17:18 -04:00
Jamal Jackson ee7bb0f455 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_wallet_created
# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
2016-09-02 06:57:50 -04:00
Jamal Jackson c4d159ca1f success and backup views and styles 2016-09-02 06:50:23 -04:00
Matias Alejo Garcia b9ebe65c9b
txp at home 2016-09-01 19:14:18 -03:00
Matias Alejo Garcia f6f4a3fb28 Merge pull request #40 from cmgustavo/ref/design-14
Glidera service
2016-09-01 18:30:28 -03:00
Gustavo Maximiliano Cortez 080cf11296 Merge pull request #41 from JDonadio/bug/bws-url
Fix set bws url by default
2016-09-01 18:16:53 -03:00
Gustavo Maximiliano Cortez 7e2d3e74b2 Merge pull request #39 from bitpay/bug/fingerprint
Bug/fingerprint
2016-09-01 18:15:54 -03:00
Gustavo Maximiliano Cortez d856ef99b8 Merge pull request #35 from gabrielbazan7/feat/QrOnboarding
Qr - remove main tabs from import view (onboarding)
2016-09-01 17:50:31 -03:00
Javier 3818c783a0 set bws url by default 2016-09-01 16:58:24 -03:00