Commit Graph

28 Commits

Author SHA1 Message Date
Gabriel Bazán a2797831da fix scroll of terms in ios 2016-10-17 16:58:58 -03:00
Matias Alejo Garcia a8becd4ba4
fix multiple outputs 2016-10-13 16:33:25 -03: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 fa7c746f5e added additional options to external service to provide custom message. disabled confirm dialog where needed 2016-10-12 15:29:06 -04: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
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
Marty Alcala 908bbdff9c prelim timeline-content styling 2016-10-11 16:48:03 -04:00
Marty Alcala a637c1b61d add single-line item style 2016-10-11 15:36:28 -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
Jason Dreyzehner c19bbc539e feat(design): correct bitcoin icon across all views 2016-10-11 14:41:57 -04:00
Gabriel Bazán 8d80150322 hide confirmation label when is unconfirmed 2016-10-11 15:32:26 -03:00
Matias Alejo Garcia 8607867d71 Merge pull request #327 from msalcala11/slideToPayComponent
Implement Slide to Pay
2016-10-11 11:47:18 -03:00
Gabriel Bazán e2b995102c delete unused code and fixes 2016-10-11 10:19:05 -03:00
Jason Dreyzehner f1a849c5d8 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/new-qrscanner-permissions 2016-10-11 03:15:07 -04:00
Jason Dreyzehner 845534c727 refactor(scan): remove dead code around old desktop scanner 2016-10-10 23:09:27 -04:00
Marty Alcala 82ad31724b wire slide to accept component to proposal accept screen 2016-10-10 18:52:59 -04:00
Matias Alejo Garcia 183dde73c4
fix font on tx-send 2016-10-10 14:56:14 -03:00
Jamal Jackson 93625092c5 removed scanner tip 2016-10-07 16:42:51 -04:00
Jamal Jackson 7f2dae6960 killed receive tips 2016-10-07 16:42:05 -04:00
Jason Dreyzehner de6e8062d5 build(www): rename public directory to www 2016-10-06 00:26:57 -04:00