1639 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kukks	fc9cd5bdf0	Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch	2018-12-20 17:57:04 +01:00
Kukks	a434c45196	fix function names	2018-12-20 17:56:57 +01:00
Nicolas Dorier	87b316ec23	Merge pull request #439 from Kukks/grs-clightning ... Add lightning icon for GRS	2018-12-20 22:43:28 +09:00
nicolas.dorier	9c99ffae57	Lightning charge integration	2018-12-20 22:40:32 +09:00
Andrew Camilleri	30a3a84ec9	fix final issues with integration	2018-12-20 14:33:31 +01:00
nicolas.dorier	d0f585df9d	fix tests	2018-12-20 21:34:09 +09:00
nicolas.dorier	bac2db5cda	Add timeout to lightning tests	2018-12-20 21:27:08 +09:00
nicolas.dorier	c35bf2f483	fix docker compose	2018-12-20 21:23:24 +09:00
nicolas.dorier	2e04c5e39c	Update docker-compose test	2018-12-20 21:20:30 +09:00
nicolas.dorier	9dcf16e819	Add xunit diagnostic message	2018-12-20 21:00:06 +09:00
nicolas.dorier	361d494cde	Accept cookiefilepath as alternative to cookiefile for spark connection string	2018-12-20 20:24:06 +09:00
nicolas.dorier	4d7015294e	Fix configuration of lnd rest	2018-12-20 20:12:36 +09:00
nicolas.dorier	5f16fb4668	report slow tests	2018-12-20 18:44:39 +09:00
nicolas.dorier	4bf2228675	Show test logs in CircleCI	2018-12-20 18:35:32 +09:00
Nicolas Dorier	2ba823f192	Merge pull request #465 from Kukks/master ... do not add ln payment if amount couldn't be parsed	2018-12-20 18:09:57 +09:00
Andrew Camilleri	27fa2d5b69	do not add ln payment if amount couldn't be parsed	2018-12-20 09:21:20 +01:00
nicolas.dorier	47ef7661d8	Fix search for macaroon	2018-12-20 17:08:32 +09:00
nicolas.dorier	3f6ff25322	update es-ES	2018-12-20 17:00:30 +09:00
nicolas.dorier	f56c23009a	bump	2018-12-20 16:57:59 +09:00
nicolas.dorier	e80593fb7b	Expose LND's other macaroon if possible	2018-12-20 16:52:04 +09:00
nicolas.dorier	57324345ac	Remove remaining of RestrictedMacaroon	2018-12-20 16:24:36 +09:00
nicolas.dorier	73e280157d	Show the gRPC cypher suites for gRPC consumption	2018-12-20 14:16:23 +09:00
Kukks	3e2ff55954	Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch	2018-12-19 10:41:36 +01:00
nicolas.dorier	70d1d0d230	Remove volumes before running tests	2018-12-19 15:50:20 +09:00
nicolas.dorier	94e0048a3b	Redirect users to docs.btcpayserver.org on home page	2018-12-19 15:30:10 +09:00
Kukks	40c645e433	coinswitch integration	2018-12-18 20:14:59 +01:00
Kukks	b2e5415a35	coinswitch integration	2018-12-18 20:00:30 +01:00
Kukks	2b4603a234	coinswitch integration	2018-12-18 19:01:58 +01:00
nicolas.dorier	9db5c0f375	Hack tests to make currency formatting work on linux	2018-12-19 00:28:06 +09:00
nicolas.dorier	2bb24282d2	Clean previous run with dock-compose	2018-12-19 00:15:33 +09:00
nicolas.dorier	998472e463	Fix symbol display on linux	2018-12-19 00:11:15 +09:00
nicolas.dorier	63ff46a768	cache docker on circleCI for tests	2018-12-18 23:27:57 +09:00
nicolas.dorier	660f43e3b7	Add fast test for JPY formatting	2018-12-18 23:26:35 +09:00
nicolas.dorier	0ba96aa4b8	Fix export tests	2018-12-18 23:24:22 +09:00
nicolas.dorier	d85247d2ad	Run tests inside container	2018-12-18 22:35:58 +09:00
nicolas.dorier	9ca85ed365	Change column order	2018-12-18 21:44:51 +09:00
nicolas.dorier	93113fd871	Fix payment exports to reflect correctly payment data, rename fields.	2018-12-18 21:35:52 +09:00
nicolas.dorier	d5ae79c38c	Add more information about status in the CSV export	2018-12-18 19:33:14 +09:00
nicolas.dorier	7cf07b27e3	Invoice export should not prefix amounts with crypto code	2018-12-18 19:20:10 +09:00
nicolas.dorier	bb0f986b0c	Add additional test on euro formatting	2018-12-18 19:09:55 +09:00
nicolas.dorier	2c2a85327f	Add test logs	2018-12-18 01:02:27 +09:00
nicolas.dorier	7bf03e497b	In cart js, add space to symbol if needed (fix #450)	2018-12-18 00:38:59 +09:00
nicolas.dorier	7a4dee3d38	Point of Sale returns correct currency information (#450)	2018-12-18 00:25:17 +09:00
nicolas.dorier	7b27d6f0bb	Merge branch 'mariodian-pos-product-management'	2018-12-15 23:40:04 +09:00
nicolas.dorier	83dc95a0a7	Remove dollar sign in textbox	2018-12-15 23:39:45 +09:00
nicolas.dorier	d60889f952	Merge branch 'pos-product-management' of https://github.com/mariodian/btcpayserver into mariodian-pos-product-management	2018-12-15 23:22:07 +09:00
Nicolas Dorier	8c9952973d	Merge pull request #449 from sipsorcery/uxpwdreset ... HTML formatting fix for issue #448.	2018-12-15 23:20:09 +09:00
Mario Dian	00673bdb7f	Fix product width on smaller screens	2018-12-14 16:16:08 +08:00
Mario Dian	d039890a9b	Create js-only product management in PoS	2018-12-14 16:03:02 +08:00
nicolas.dorier	41e88c07fe	update languages	2018-12-14 13:14:03 +09:00