Commit Graph

223 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez 8ee033436f
Fix conflict 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 756e1aa489
Adds node-webkit support to package.json, icons/favicon. Fix setup-win syntax. Adds new constants to templates 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 252ebf45b3
Fix handle URL (mobile). Replaces visa-api by api 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 222fbe57ff
Bitpay card config external json 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 63916402a3
Removes cards. Fix history. New method getInvoiceHistory 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez c14a3b0658
Fix tab-home 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 3f2f169db3
Activate caching for bitpay card 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 9196e07f3a
Fix card intro 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 35cd6ce4cc
New flow to link the bitpay card 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 4f5c814c50
Fix first view 2016-10-13 17:50:21 -03:00
Gustavo Maximiliano Cortez 6d97ef57d5
BitPay Card Intro (slides) 2016-10-13 17:50:21 -03:00
Gabriel Bazán 1b8f656579 fix gravatar 2016-10-13 16:53:49 -03:00
Matias Alejo Garcia a8becd4ba4
fix multiple outputs 2016-10-13 16:33:25 -03:00
Gabriel Bazán d0f7f15835 rename 2016-10-13 16:27:17 -03:00
Gabriel Bazán 2a390760bc disable email notifications 2016-10-13 16:10:21 -03:00
Matias Alejo Garcia 68d3195f7f Merge pull request #442 from JDonadio/ref/homogenize-wallet-name
Homogenize wallet names
2016-10-13 16:02:44 -03:00
Matias Alejo Garcia 9667aa8e24 Merge pull request #423 from JDonadio/fix/encrypted-02
Fix export/import wallet with encrypted pk
2016-10-13 16:02:12 -03:00
Jamal Jackson 9e5debc1b6 created responsive view for iPhone 5 through 7 plus 2016-10-13 14:54:54 -04:00
Jamal Jackson 04539bfca8 removed typo 2016-10-13 14:34:24 -04:00
Jamal Jackson 796b70304e last updates 2016-10-13 14:33:31 -04:00
Jamal Jackson 4124e68e74 polish for iPhone5 and iPhone 6 2016-10-13 14:28:41 -04:00
Javier 7f09012169 Homogenize wallet names 2016-10-13 15:09:52 -03:00
Jamal Jackson 3769772f74 removed duplicate help and support 2016-10-13 12:22:05 -04:00
Jamal Jackson a0201cfec8 removed false declaration, fixed broken string in open link function call 2016-10-13 12:20:53 -04:00
Jamal Jackson 992f0bd8a4 removed new releases link 2016-10-13 12:11:36 -04:00
Jamal Jackson 794e0a304e Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser
# Conflicts:
#	www/views/tab-settings.html
2016-10-13 11:57:24 -04:00
Gustavo Maximiliano Cortez c6c8931d25 Merge pull request #439 from gabrielbazan7/fix/sendQrIcon
fix doble tap to open qr view
2016-10-13 12:42:15 -03:00
Gabriel Bazán 9753a2067c fix double tap on send qr icon 2016-10-13 12:41:02 -03:00
Javier 696c5bbd18 fix export wallet 2016-10-13 12:03:46 -03:00
Matias Alejo Garcia 94570179f2 Merge pull request #438 from cmgustavo/bug/import-export-styling
Fix styling for import/export views
2016-10-13 11:59:10 -03:00
Gustavo Maximiliano Cortez 15b45a9b9c Merge pull request #437 from JDonadio/fix/select-current-color
Current color selected
2016-10-13 11:50:20 -03:00
Gustavo Maximiliano Cortez f00574140a
Fix styling for import/export views 2016-10-13 11:47:32 -03:00
Javier c75df343fd current color selected 2016-10-13 11:45:03 -03:00
Gabriel Bazán 3d5522b227 adding has click 2016-10-13 11:27:34 -03:00
Jamal Jackson 31e2d072cf Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/recieve_view_polish 2016-10-13 10:09:23 -04:00
Gabriel Bazán 4895b7f6b1 loading fee 2016-10-13 10:45:40 -03:00
Gabriel Bazán 9030eba0b8 show feelevel, remove arrow, add margin left to memo 2016-10-13 10:45:40 -03:00
Gabriel Bazán 237cc2f58c remove hasClick and use isCordova 2016-10-13 10:45:40 -03:00
Matias Alejo Garcia 89d207d364 Merge pull request #426 from msalcala11/sendStyling
Send view styling and wallet switcher
2016-10-13 10:45:22 -03:00
Gustavo Maximiliano Cortez b836e3b9ab Merge pull request #431 from bitjson/feature/settings-polish
Design: settings polish
2016-10-13 10:32:34 -03:00
Gustavo Maximiliano Cortez 5f487d19af Merge pull request #421 from gabrielbazan7/fix/import
remove ion toogle
2016-10-13 09:39:01 -03:00
Jamal Jackson 6836139ead Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/recieve_view_polish 2016-10-13 08:13:32 -04:00
Jason Dreyzehner f5041b09ab feat(design): improve design of all add flows
422
2016-10-13 01:31:15 -04:00
Jason Dreyzehner 08d49001f1 feat(design): polish address book
Closes #420, closes #376
2016-10-13 00:02:06 -04:00
Jason Dreyzehner 04672a779d fix(translations): correct misspelled translate directives 2016-10-13 00:00:25 -04:00
Jason Dreyzehner 7637a49dc4 feat(design): clean up terms of service view in settings 2016-10-12 22:32:44 -04:00
Jason Dreyzehner 0e4b4fd28f feat(design): improve design of preferences about, app logs 2016-10-12 22:26:55 -04:00
Jason Dreyzehner ff45e1dbc8 Merge remote-tracking branch 'bitpay-wallet/ref/design' into feature/settings-polish 2016-10-12 22:04:02 -04:00
Jason Dreyzehner 4f8758c6d7 feat(design): polish all settings views
Closes #424
2016-10-12 22:01:48 -04:00
Jason Dreyzehner b755f915c0 fix(send): fully hide zero state when user has funds 2016-10-12 21:21:47 -04:00
Jason Dreyzehner 41c01250a0 fix(home): correct subtle item divider details on home tab
fixes #428
2016-10-12 21:17:30 -04:00
Jason Dreyzehner 53366f6faa fix(preferences): fix improperly closed a tag 2016-10-12 20:41:15 -04:00
Marty Alcala e8aa23a111 remove comments 2016-10-12 20:26:27 -04:00
Marty Alcala ec3fca4cda make wallet selector a standalone directive 2016-10-12 20:13:28 -04:00
Jason Dreyzehner d4cd402294 feat(design): improve design of wallet color selection 2016-10-12 20:10:22 -04:00
Jason Dreyzehner 9ec7d5f38c feat(design): improve wallet settings view and wallet settings alias view 2016-10-12 19:33:54 -04:00
Marty Alcala f9e4d731f4 handle really long lists of wallets in selector 2016-10-12 19:19:35 -04:00
Jason Dreyzehner cf35248c7e feat(design): better settings list organization 2016-10-12 19:11:02 -04:00
Jason Dreyzehner 779205c7ad feat(design): improve design of bitcoin network fee policy view 2016-10-12 18:59:45 -04:00
Marty Alcala 252686688e allow wallets to be selected 2016-10-12 18:49:00 -04:00
Jason Dreyzehner 535d2e0a08 feat(design): improve layout and design of tab-settings
closes #378
2016-10-12 18:05:28 -04:00
Marty Alcala 444d25b9ee wire wallet balance to wallet select component 2016-10-12 17:40:53 -04:00
Marty Alcala b42bf01f6a populate wallet list 2016-10-12 17:20:06 -04:00
Gabriel Bazán 47a0a1f83d remove ion toogle 2016-10-12 17:43:23 -03:00
Gustavo Maximiliano Cortez 146f8a43a3
Fix styling: delete wallet button 2016-10-12 16:46:44 -03:00
Jamal Jackson 404b76d65b fix settings view issue 2016-10-12 15:33:52 -04:00
Jamal Jackson fa7c746f5e added additional options to external service to provide custom message. disabled confirm dialog where needed 2016-10-12 15:29:06 -04:00
Marty Alcala 1d5299e254 add back button 2016-10-12 15:21:38 -04:00
Matias Alejo Garcia 0257724912 Merge pull request #413 from cmgustavo/ref/copayers-01
Ref copayers view
2016-10-12 16:13:04 -03:00
Marty Alcala ce298fdfb6 prelim action sheet directive 2016-10-12 15:01:48 -04:00
Gabriel Bazán a505842310 fix send tips 2016-10-12 15:56:21 -03:00
Gustavo Maximiliano Cortez bbf1c632df
Ref copayers view 2016-10-12 15:07:09 -03:00
Marty Alcala 2d205cbebd handle insufficient funds case 2016-10-12 14:04:23 -04:00
Jamal Jackson 3d9e40b4c5 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser
# Conflicts:
#	src/js/services/externalLinkService.js
2016-10-12 13:57:21 -04:00
Jamal Jackson 337b56258e improved slider card design 2016-10-12 13:54:02 -04:00
Marty Alcala d56504b253 add click to accept component to send screen 2016-10-12 13:48:32 -04:00
Marty Alcala d10e0bfcc9 make send screen items clickable 2016-10-12 12:15:24 -04:00
Marty Alcala 702697a9dc prelim send screen styling 2016-10-12 11:45:11 -04:00
Matias Alejo Garcia 99efe06343 Merge pull request #383 from JDonadio/fix/edit-note
Fix edit memo
2016-10-12 11:50:10 -03:00
Gustavo Maximiliano Cortez bf630418d8 Merge pull request #401 from gabrielbazan7/feat/language
disable language auto detection
2016-10-12 10:31:46 -03:00
Gabriel Bazán 78aa0442c1 disable language auto detection 2016-10-12 10:24:15 -03:00
Jamal Jackson 7becb504f4 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser
# Conflicts:
#	www/views/glidera.html
2016-10-12 08:59:04 -04:00
Jamal Jackson f808a3afcd added new logic to external link service to open in system browser with confirm message to notify them they're leaving and give option to cancel 2016-10-12 08:57:08 -04:00
Matias Alejo Garcia 31e6a0d6e4 Merge pull request #392 from msalcala11/sendStyling
Proposal detail modal styling
2016-10-12 08:28:22 -03:00
Jason Dreyzehner 2e6d394673 fix(all): the buttons 2016-10-11 23:23:54 -04:00
Marty Alcala 6bfdec29b3 fix merge conflicts 2016-10-11 19:14:13 -04:00
Marty Alcala a7fe6fc27b remove commented code 2016-10-11 19:10:13 -04:00
Marty Alcala 7451aa0e8f add rejected styling 2016-10-11 19:00:16 -04:00
Marty Alcala 7f40490d0b better style proposal deletion help text 2016-10-11 18:24:01 -04:00
Marty Alcala b3ad938ad4 fix borders and bottom for slide to pay 2016-10-11 18:20:10 -04:00
Marty Alcala dd6a55a5a1 more proposal timeline styling 2016-10-11 18:05:00 -04:00
Matias Alejo Garcia 6b2cbccecd
workaround to link inner childs 2016-10-11 18:37:47 -03:00
Marty Alcala 908bbdff9c prelim timeline-content styling 2016-10-11 16:48:03 -04:00
Jason Dreyzehner 7d9a4244c9 feat(send): design and scaffold zero-state for send tab 2016-10-11 16:36:01 -04:00
Javier 50287bba2f fix edit memo 2016-10-11 16:46:06 -03:00
Marty Alcala a637c1b61d add single-line item style 2016-10-11 15:36:28 -04:00
Jason Dreyzehner 73018e062f feat(design): polish send tab design 2016-10-11 15:27:25 -04:00
Marty Alcala 70367bc4e7 more proposal page styling 2016-10-11 15:22:11 -04:00
Jason Dreyzehner fbdc23a012 Merge pull request #381 from bitjson/wip/design
Design Work
2016-10-11 15:14:05 -04:00
Marty Alcala 288d122b3d prelim styling of payment proposal modal 2016-10-11 14:45:54 -04:00