BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,798 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

1800 Commits

Author SHA1 Message Date
Gabriel Bazán f1576508ba fix email 2016-09-23 13:34:17 -03:00
Gabriel Bazán 2b3fb7eea4 fix alias 2016-09-23 13:31:10 -03:00
Gustavo Maximiliano Cortez 6955f8728d
Fix amazon 2016-09-23 13:13:37 -03:00
Gustavo Maximiliano Cortez 6a3bd53464 Merge pull request #175 from gabrielbazan7/fixes 
fixes
 2016-09-23 13:11:38 -03:00
Gabriel Bazán 35756cf529 fixes 2016-09-23 12:42:33 -03:00
Jamal Jackson 6e23e35171 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-23 11:30:56 -04:00
Gustavo Maximiliano Cortez 39383b30ad Merge pull request #173 from cmgustavo/ref/design-47 
Minor bug fixes
 2016-09-23 12:12:39 -03:00
Gustavo Maximiliano Cortez 1923a3d2f8 Merge pull request #160 from jamal-jackson/feature/settings_views_polish 
updated add contact view for when user has empty address book
 2016-09-23 12:11:59 -03:00
Gustavo Maximiliano Cortez 3292ad382d
Minor bug fixes 2016-09-23 12:07:56 -03:00
Jamal Jackson 4004efd5e4 Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book 
# Conflicts:
#	src/sass/views/address-book.scss
 2016-09-23 10:11:19 -04:00
Jamal Jackson ee10ebff9c updated address book add and no address for user 2016-09-23 10:10:17 -04:00
Jamal Jackson 097e6f6d86 removed mistake paste 2016-09-23 09:56:28 -04:00
Jamal Jackson 2799fcb949 removed commented code 2016-09-23 09:53:15 -04:00
Jamal Jackson f82ea8502f started new address book styling 2016-09-23 09:50:17 -04:00
Gabriel Bazán eec846f422 fix confirm popup 2016-09-23 10:33:26 -03:00
Jamal Jackson 06fe55519e updated save function 2016-09-23 09:26:26 -04:00
Gustavo Maximiliano Cortez d8c8a7004f
Fix click to pay 2016-09-22 17:40:17 -03:00
Gabriel Bazán 8f4f16a906 delete fixed button 2016-09-22 17:10:28 -03:00
Gustavo Maximiliano Cortez 337ab55f10 Merge pull request #162 from cmgustavo/ref/design-42 
Fix transitions for address book and delete wallet
 2016-09-22 16:56:41 -03:00
Gabriel Bazán 8f40484a71 fixes 2016-09-22 16:50:06 -03:00
Gustavo Maximiliano Cortez f1817047e0
Fix transitions for address book and delete wallet 2016-09-22 16:43:35 -03:00
Jamal Jackson 6bfcf8e874 added color names 2016-09-22 15:36:44 -04:00
Gabriel Bazán d73ca23548 card for header and QR 2016-09-22 16:18:27 -03:00
Jamal Jackson 64fb4a2e81 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/settings_views_polish 
# Conflicts:
#	public/views/preferencesLanguage.html
 2016-09-22 15:08:53 -04:00
Jamal Jackson ee4ba85d35 added settings class 2016-09-22 15:06:34 -04:00
Gabriel Bazán b713d26173 go from create new shared to copayers 2016-09-22 16:04:05 -03:00
Jamal Jackson 5948123393 improved list style on main settings and preferences views 2016-09-22 12:43:35 -04:00
Jamal Jackson 7973d3a75f updating list view styles throughout settings tab 2016-09-22 12:16:51 -04:00
Jamal Jackson e3bd63777c updated add contact view for when user has empty address book 2016-09-22 11:46:52 -04:00
Gustavo Maximiliano Cortez a8ed208ba7 Merge pull request #156 from cmgustavo/ref/design-40 
Views caching
 2016-09-22 11:57:52 -03:00
Gustavo Maximiliano Cortez c88df6c599 Merge pull request #157 from gabrielbazan7/fix/addEntrySend 
fix okay button on status modal and others
 2016-09-22 11:57:12 -03:00
Gustavo Maximiliano Cortez ca292813eb
Adds cache for preferences, walletDetails 2016-09-22 11:55:23 -03:00
Gustavo Maximiliano Cortez 2a9c3c82e9
Adds cache for amount, backup, amazon, glidera, export, walletDetails 2016-09-22 10:34:00 -03:00
Gabriel Bazán 868e6b086f show add to address book only from tab send 2016-09-22 10:30:35 -03:00
Gabriel Bazán a6b3b204bd fix okay button on status modal and others 2016-09-22 10:03:38 -03:00
Gustavo Maximiliano Cortez 9cb0dc128c
Fix cache for activity, addressbook, amazon, proposals 2016-09-22 01:47:39 -03:00
Gustavo Maximiliano Cortez 1edcf184ee
Minor fixes 2016-09-21 19:36:24 -03:00
Gustavo Maximiliano Cortez 889ebb8c6c
Enable cache for nav tabs 2016-09-21 19:20:15 -03:00
Gustavo Maximiliano Cortez b86f2e240d Merge pull request #155 from jamal-jackson/feature/add_wallet_polish 
added new images styled icons and list item rows
 2016-09-21 19:19:52 -03:00
Gustavo Maximiliano Cortez 006ad0be39 Merge pull request #154 from jamal-jackson/feature/onboarding_last_steps 
updated text to match new copy
 2016-09-21 19:19:18 -03:00
Gustavo Maximiliano Cortez 912789ccb6 Merge pull request #153 from gabrielbazan7/feat/addEntrySend 
add addressbook entry when send success
 2016-09-21 19:18:55 -03:00
Gustavo Maximiliano Cortez 3f34cb3da1 Merge pull request #152 from jamal-jackson/feature/settings_views_polish 
updated settings list design to match comps
 2016-09-21 19:18:32 -03:00
Gustavo Maximiliano Cortez 745babcc1f Merge pull request #151 from JDonadio/bug/memo 
Txp/Tx Modal
 2016-09-21 19:17:57 -03:00
Javier 93d694d048 sync memo 2016-09-21 17:28:59 -03:00
Gabriel Bazán 1013eb0f40 fixes 2016-09-21 16:39:40 -03:00
Jamal Jackson be4fe6bb62 added new images styled icons and list item rows 2016-09-21 15:21:18 -04:00
Jamal Jackson 161adad67b updated text to match new copy 2016-09-21 14:38:22 -04:00
Gabriel Bazán ef90113dd8 add addressbook entry when send success 2016-09-21 15:13:22 -03:00
Jamal Jackson ac93974640 updated settings list design to match comps 2016-09-21 14:07:01 -04:00
Javier 60a7f0c287 save memo correctly 2016-09-21 15:02:09 -03:00
Gustavo Maximiliano Cortez 28f0473275 Merge pull request #150 from cmgustavo/ref/design-39 
Fix title: Confirm
 2016-09-21 14:41:59 -03:00
Gustavo Maximiliano Cortez 580a837805 Merge pull request #149 from jamal-jackson/feature/home_views_polish 
Polishing up styling on home tab
 2016-09-21 14:41:51 -03:00
Gustavo Maximiliano Cortez ae8a9fe73d
Fix title: Confirm 2016-09-21 14:22:55 -03:00
Jamal Jackson fda7e641a1 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/home_views_polish 
# Conflicts:
#	public/views/tab-home.html
 2016-09-21 13:18:06 -04:00
Jamal Jackson cf0f323880 fixed border on home tab 2016-09-21 13:13:39 -04:00
Gabriel Bazán c824ff6fa5 add buttons for no cordova devices 2016-09-21 12:17:00 -03:00
Gabriel Bazán cb64e57e45 requeriments to send 2016-09-21 12:17:00 -03:00
Gustavo Maximiliano Cortez 5527cccc38 Merge pull request #146 from cmgustavo/ref/design-38 
Ref/design 38
 2016-09-21 12:10:34 -03:00
Gustavo Maximiliano Cortez e5b237bb7a Merge pull request #145 from JDonadio/feat/open-tx-modal 
Open tx/txp modal without navigation
 2016-09-21 12:10:03 -03:00
Gustavo Maximiliano Cortez c084faa907
Updating back button 2016-09-21 12:05:30 -03:00
Jamal Jackson b0f2356b49 added correct icon type and background to home tip on home tab 2016-09-21 10:52:47 -04:00
Javier b146d40539 open txp modal from recent activity 2016-09-21 11:38:38 -03:00
Gustavo Maximiliano Cortez d6d0b75efe
Starting splash 2016-09-21 11:28:31 -03:00
Gustavo Maximiliano Cortez 74c6e2e3b7
Fix confirm dialogs and popupService. Fix delete amount in amazon view. Fix ionic topbar 2016-09-20 18:22:12 -03:00
Gustavo Maximiliano Cortez 53a7a2ff05
Removes unnecessary icon back elements. Set icon back in route.js 2016-09-20 17:05:53 -03:00
Javier 1cfd4c733f refactor call tx modal 2016-09-20 16:26:37 -03:00
Gabriel Bazán 800765eeec fixes 2016-09-20 15:59:32 -03:00
Gabriel Bazán 473feddfc8 use accept slider directive 2016-09-20 15:58:44 -03:00
Jamal Jackson 0610a91556 centered bit address 2016-09-20 14:36:54 -04:00
Javier 64b879fcd3 open tx modal from home 2016-09-20 13:56:54 -03:00
Jamal Jackson f74ff4f40f added click to go to slide in wallets, added max-width 2016-09-20 12:35:12 -04:00
Javier ae266e397b wip 2016-09-20 12:02:45 -03:00
Gabriel Bazán 0e006d5416 add time format and icon to txp details 2016-09-20 11:13:22 -03:00
Gabriel Bazán 43dfcba55c refactor txp details 2016-09-20 10:02:28 -03:00
Gustavo Maximiliano Cortez 53423791f7 Merge pull request #138 from cmgustavo/ref/design-37 
Fix success state after TOS completion
 2016-09-20 09:53:45 -03:00
Gustavo Maximiliano Cortez b7750e6927 Merge pull request #137 from jamal-jackson/feature/onboarding_iOS10_fixes 
fix header font size issue on tour page
 2016-09-20 09:53:26 -03:00
Gustavo Maximiliano Cortez 090dd0cda6 Merge pull request #135 from JDonadio/ref/send 
Refactor on send - receive transaction view
 2016-09-20 09:52:53 -03:00
Javier f44d8a6e77 support timeline 2016-09-19 18:16:40 -03:00
Jamal Jackson 6d0d82b04f fix get new and updates positioning 2016-09-19 15:34:32 -04:00
Gustavo Maximiliano Cortez ff66879694
Fix success state after TOS completion 2016-09-19 16:31:36 -03:00
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
Javier 26f4f42ec3 show alternative amount 2016-09-19 14:27:22 -03:00
Javier b3bf13918d replace comment 2016-09-19 14:27:22 -03:00
Javier 574d29777d addapted view 2016-09-19 14:25:00 -03:00
Javier 0aa952abff homogeinize 2016-09-19 14:25:00 -03:00
Javier e668f0db61 ref view 2016-09-19 14:25:00 -03: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
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