Commit graph

2,055 commits

Author SHA1 Message Date
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
Nick Cardin
7e29b9eb98 send view first pass 2016-09-08 11:36:08 -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
Gabriel Bazán
c80ec7196c fix notes on send tab 2016-09-07 16:48:16 -03:00
Jamal Jackson
dfe0c39260 added height breakpoint for disclaimer view agree to terms modal to make relative, fixed alignment on tour view 2016-09-07 15:05:30 -04:00
Javier
53cf7c32b0 fix cb 2016-09-07 15:35:14 -03: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
Gustavo Maximiliano Cortez
4f226da443 Merge pull request #75 from gabrielbazan7/fix/terms
add  parameter to controller in termsjs
2016-09-07 15:01:16 -03:00
Jamal Jackson
b0c5fc22db added help circle and tip modal 2016-09-07 13:49:08 -04:00
Gabriel Bazán
ffe8df203f add parameter to controller in termsjs 2016-09-07 13:55:06 -03: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
419c1e617b clean 2016-09-07 12:28:41 -03:00
Javier
dd9e48df14 complete export process 2016-09-07 12:23:09 -03:00
Jamal Jackson
364fd32ca6 fixed check in circle position on disclaimer page 2016-09-07 10:33:58 -04:00
Jamal Jackson
a2c509092d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-07 10:33:23 -04: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
Jamal Jackson
ad862bc78c added arrow top to wallets background 2016-09-07 09:56:52 -04:00
Gustavo Maximiliano Cortez
42a8eaa119
Fix button to skip onboarding-email 2016-09-07 10:49:47 -03:00
Jamal Jackson
23b67a4afc fixed issue with absolute position on safari browser 2016-09-07 09:47:47 -04: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
Javier
dfe8dea8bc fix variable 2016-09-06 17:24:49 -03: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
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
Matias Alejo Garcia
774aaec8ca Merge pull request #60 from cmgustavo/ref/design-17
Ref/design 17
2016-09-05 18:37:03 -03:00
Javier
7d7bad50e7 fix duplicate template entry 2016-09-05 18:04: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