985 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Camilleri	ada6f3b844	Finish rate api	2018-05-28 15:30:43 +02:00
Andrew Camilleri	c8a26ce952	api fixes	2018-05-28 14:55:49 +02:00
Andrew Camilleri	6cf80b7533	small rename	2018-05-28 14:29:23 +02:00
Andrew Camilleri	79df523bb2	reorder methods	2018-05-28 10:20:18 +02:00
Andrew Camilleri	e921f9757a	Merge remote-tracking branch 'btcpayserver/master' into feature/bitpayrates	2018-05-28 09:05:11 +02:00
Nicolas Dorier	b497d1871e	Merge pull request #195 from andres-pinilla/patch-3 ... Updated es.js	2018-05-28 10:50:30 +09:00
Andrés Pinilla	c7cd029482	Update es.js ... Various strings updated.	2018-05-27 20:36:32 -05:00
Andrew Camilleri	bed9737d64	Merge remote-tracking branch 'btcpayserver/master' into feature/bitpayrates	2018-05-26 14:42:17 +02:00
nicolas.dorier	556082c4c9	fix json serialization	2018-05-26 18:29:57 +09:00
nicolas.dorier	6a46d02fc6	Add dummy policies field	2018-05-26 18:26:02 +09:00
Nicolas Dorier	d75e5b8b12	Merge pull request #129 from cronos-polis/master ... Polis Integration	2018-05-26 14:50:32 +09:00
nicolas.dorier	a97ef2eee8	MinerFee matching Bitpay API	2018-05-25 22:49:49 +09:00
nicolas.dorier	be33ebc168	fix typo	2018-05-25 17:35:01 +09:00
nicolas.dorier	789193a0c8	fix typo	2018-05-25 12:55:29 +09:00
Nicolas Dorier	01792cf299	Merge pull request #190 from yashbhutwala/fix_typo ... Fix spelling of lightning	2018-05-25 11:41:46 +09:00
Yash Bhutwala	ff9265f721	Fix spelling of lightning	2018-05-24 16:26:01 -04:00
nicolas.dorier	8d61314852	Use FullNotification and improve instructions	2018-05-25 00:02:24 +09:00
nicolas.dorier	1ce6ae8727	fix typo	2018-05-24 23:58:24 +09:00
nicolas.dorier	dec5dbc0d2	Ability to pass fields to POS app #181	2018-05-24 23:54:48 +09:00
nicolas.dorier	4e32dad1ea	Can solve inverses at exchange level	2018-05-23 19:29:01 +09:00
nicolas.dorier	127ca7582f	Make sure inverse rules have priority	2018-05-23 19:13:12 +09:00
nicolas.dorier	b98993f84b	fix typo	2018-05-23 11:16:19 +09:00
nicolas.dorier	e35f074b66	Better label for Rate Multiplier	2018-05-23 02:43:22 +09:00
nicolas.dorier	ba3d13d56c	Make sure the rate of the merchant is using the ask of a divided exchange	2018-05-23 02:18:38 +09:00
nicolas.dorier	ead67887ab	Enable SSL was ignored	2018-05-23 00:59:50 +09:00
Nicolas Dorier	437f27f107	Merge pull request #188 from andres-pinilla/master ... Better spanish translation (tu)	2018-05-22 14:11:25 +09:00
Andrés Pinilla	8d41a8e98d	Better spanish translation (tú)	2018-05-21 23:15:04 -05:00
nicolas.dorier	7e6ab015a6	Fix bug on Error page	2018-05-22 01:05:45 +09:00
Andrew Camilleri	2583eb15ec	Merge remote-tracking branch 'btcpayserver/master' into feature/bitpayrates	2018-05-21 16:49:43 +02:00
Andrew Camilleri	1879ea55e8	init bitpay rates api	2018-05-21 16:49:37 +02:00
nicolas.dorier	f8bc3a5081	bump	2018-05-21 20:47:07 +09:00
nicolas.dorier	dd1a93ee0e	Revert "Remove unused Error.cshtml" ... This reverts commit 7b2ef9aec2.	2018-05-21 20:44:03 +09:00
nicolas.dorier	3cf3aa63f6	CurrencyNameTable can use fallback	2018-05-20 23:37:18 +09:00
nicolas.dorier	011dd5574f	Add a fallback currency format info	2018-05-20 23:22:20 +09:00
nicolas.dorier	365911286b	bump	2018-05-20 17:04:03 +09:00
rockstardev	fe5347aa86	Maintaining BitPay compatibility ... Ref: https://github.com/btcpayserver/btcpayserver/issues/180	2018-05-20 17:00:54 +09:00
cronos	f22c8a72cd	Rebase	2018-05-16 11:21:57 -05:00
nicolas.dorier	eeb522fe7d	Remove special case for showing crypto currency	2018-05-16 21:19:48 +09:00
Nicolas Dorier	f9e40b209a	Merge pull request #179 from rockstardev/fiat ... Showing exchange rate for cryptos	2018-05-16 21:14:23 +09:00
rockstardev	20635ea3d6	Showing exchange rate for cryptos ... Ref: https://github.com/btcpayserver/btcpayserver/pull/170#issuecomment-389462155	2018-05-16 05:46:11 -05:00
nicolas.dorier	7062705d6f	bump	2018-05-16 10:40:48 +09:00
nicolas.dorier	58b994e043	fix tests	2018-05-16 10:40:25 +09:00
nicolas.dorier	640ff36fa2	fix build	2018-05-16 10:26:45 +09:00
nicolas.dorier	39ec5242d7	Bump NBitpayClient	2018-05-16 10:22:43 +09:00
nicolas.dorier	1c50210e61	fix build	2018-05-16 10:22:42 +09:00
Nicolas Dorier	a1ffda0151	Merge pull request #168 from Kukks/feature/extended-invoice ... [WIP] Feature/extended invoice	2018-05-16 10:21:52 +09:00
Nicolas Dorier	fd15348551	Merge pull request #174 from monaco-ex/pr-support-monacoin ... Support Monacoin.	2018-05-16 10:21:07 +09:00
Nicolas Dorier	989c99c550	Merge pull request #170 from rockstardev/fiat ... Display fiat value of invoice during checkout	2018-05-16 10:18:24 +09:00
rockstardev	bcf97b1474	Hiding display of payment-tabs now that we have flex line-items	2018-05-15 15:17:59 -05:00
rockstardev	67abbed66a	Removing display of exchange if invoice source amount is in crypto	2018-05-15 15:17:58 -05:00