anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity
8,472 commits 154 branches 37 tags 83 MiB
Commit graph

1,615 commits

Author SHA1 Message Date
Jamal Jackson
fc78fa8d20 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/andoid_onboarding_fixes 2016-09-19 14:19:41 -04:00
Jamal Jackson
4ec7f08e1e fix style issues with discomainer view and collect email, mostly checkbox related 2016-09-19 14:18:51 -04:00
Gustavo Maximiliano Cortez
9a951b173d Merge pull request #134 from gabrielbazan7/feat/HomeTip 
add home tip when onboarding is finished
 2016-09-19 12:18:04 -03:00
Gabriel Bazán
b363ff510c fixes 2016-09-19 12:08:10 -03:00
Gabriel Bazán
c2c70779fa add home tip when onboarding is finished 2016-09-19 12:06:46 -03:00
Gustavo Maximiliano Cortez
d46a53c404
 		Fix History from URI. Fix paypro. Fix join 2016-09-17 18:04:54 -03:00
Gustavo Maximiliano Cortez
10cc7fdf53
 		Fix routes 2016-09-16 21:01:19 -03:00
Gustavo Maximiliano Cortez
9a9dc4b2dc
 		Fix setting route 2016-09-16 17:49:08 -03:00
Gustavo Maximiliano Cortez
38fb1c033d
 		Fix addressbook route 2016-09-16 17:14:22 -03:00
Gustavo Maximiliano Cortez
2f547520b4
 		Fix Amazon routes 2016-09-16 16:25:45 -03:00
Gustavo Maximiliano Cortez
5bd450270b Merge pull request #130 from cmgustavo/ref/design-34 
Glidera route issues
 2016-09-16 14:59:41 -03:00
Gustavo Maximiliano Cortez
8a2db79345 Merge pull request #129 from gabrielbazan7/feat/NewsEmail 
Feat/news email
 2016-09-16 14:59:25 -03:00
Gustavo Maximiliano Cortez
24133452f0 Merge pull request #127 from gabrielbazan7/fix/detailsNavBar 
add ion nav bar in wallet details view
 2016-09-16 14:57:52 -03:00
Gustavo Maximiliano Cortez
eead8ee9a7
 		ion-nav-back-button generic 2016-09-16 14:54:39 -03:00
Gustavo Maximiliano Cortez
bcb6f97385
 		Fix Glidera routes 2016-09-16 14:46:25 -03:00
Gabriel Bazán
0b979c2de7 fixes 2016-09-16 14:43:01 -03:00
Gabriel Bazán
a8f6b3c27d add news and updates checkbox in onboarding 2016-09-16 14:40:55 -03:00
Gabriel Bazán
d2a1fd5f81 fix 2016-09-16 12:19:40 -03:00
Gabriel Bazán
51bec11127 add ion nav bar in wallet details view 2016-09-16 11:30:16 -03:00
Jamal Jackson
7afa277178 fix welcome view background, added margin to disclaimer h3, added direction to scroll on terms view 2016-09-16 10:07:50 -04:00
Gustavo Maximiliano Cortez
1998d78b4a Merge pull request #124 from nacardin/feature/send2 
update tab-home view
 2016-09-15 15:03:17 -03:00
Nick Cardin
df824695de add padding to next steps 2016-09-15 13:58:50 -04:00
Nick Cardin
2bde795e15 update home tab icons 2016-09-15 13:51:23 -04:00
Jamal Jackson
5ad94a8579 fix terms page back button to arrow and not text 2016-09-15 10:47:10 -04:00
Jamal Jackson
7357273314 fix backup modal header image 2016-09-15 10:41:18 -04:00
Jamal Jackson
be58b7983d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_screenshot_warning_model 2016-09-15 09:37:36 -04:00
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
d38a3a01be added screenshot model 2016-09-14 14:07:44 -04: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