3488 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Vlad Stan	810cb46e34	fix: SQL syntax	2022-11-28 16:11:05 +02:00
Vlad Stan	3d314eae38	fix: sql insert	2022-11-28 16:02:07 +02:00
Vlad Stan	e818f34888	fix: rebase clean-up	2022-11-28 15:52:39 +02:00
Vlad Stan	2f5e5cf4d4	fix: quote user column	2022-11-28 15:25:19 +02:00
Vlad Stan	7380c37c73	fix: timestamp does not exist on themes	2022-11-28 15:25:19 +02:00
ben	58eefd4d30	isort	2022-11-28 15:25:19 +02:00
ben	63d52581f2	Primary key	2022-11-28 15:24:23 +02:00
ben	879996039f	formatting	2022-11-28 15:24:23 +02:00
ben	577d5fccd7	adding missing css to public_charge	2022-11-28 15:24:12 +02:00
ben	e192b6c3f5	Added lost return	2022-11-28 15:24:12 +02:00
ben	1d01ed861b	resolving conflict errors	2022-11-28 15:23:49 +02:00
ben	16183a0317	Trying to fix conflict errors	2022-11-28 15:23:49 +02:00
ben	769bce0f94	Added back custom_css	2022-11-28 15:23:49 +02:00
ben	254cb8cce1	added back custom css to public page	2022-11-28 15:23:33 +02:00
ben	3a9dbb97c5	fixed admin check	2022-11-28 15:23:06 +02:00
ben	7dc90177ec	Auto stash before checking out "HEAD"	2022-11-28 15:23:06 +02:00
ben	a19bb520c3	removed compact_charge	2022-11-28 15:22:35 +02:00
ben	5b75d4f262	added back crud	2022-11-28 15:21:34 +02:00
ben	5c029a7af9	only allows admins to use custom themes	2022-11-28 15:20:35 +02:00
ben	c54077f65b	Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css" ... This reverts commit f98278faba.	2022-11-28 15:19:51 +02:00
callebtc	9d27a6f272	use isinstance, not type	2022-11-28 15:19:51 +02:00
callebtc	c448287f4a	rewrite values in db	2022-11-28 15:19:51 +02:00
callebtc	193fc349f0	strip html	2022-11-28 15:19:51 +02:00
ben	a26a13a88d	Now you can have multiple themes	2022-11-28 15:19:51 +02:00
Black Coffee	6f9d32478b	run isort and black	2022-11-28 15:18:01 +02:00
Black Coffee	1d8f4cb01b	Change user to user_id in satspay settings table and fixed first use bug	2022-11-28 15:18:01 +02:00
Black Coffee	6dd52acc5b	Remove console.log from satspay index.html	2022-11-28 15:18:01 +02:00
Black Coffee	f074d81827	Remove theme settings on satspay invoice page and default to blue theme to allow users to skin satspay invoice page more easily	2022-11-28 15:18:01 +02:00
Black Coffee	1296dd8574	Removed unused custom css api call from display.html	2022-11-28 15:17:35 +02:00
Black Coffee	7106dee2ce	Custom CSS on SatsPay server working!:)	2022-11-28 15:17:19 +02:00
Black Coffee	220dc699cf	Settings now save and load and have an insert or delete for new / existing settings	2022-11-28 15:14:26 +02:00
Black Coffee	4e9132ec04	SatsPay server save custom css settings now working	2022-11-28 15:13:57 +02:00
Black Coffee	00cb7a8d21	Added satspay settings migration	2022-11-28 15:11:39 +02:00
calle	3bbff31949	Merge pull request #1151 from lnbits/revert-1143-cashu ... Revert "Extension: Cashu"	2022-11-27 18:03:36 +01:00
calle	5c09469d61	Revert "Extension: Cashu"	2022-11-27 18:03:20 +01:00
calle	8d12fca072	Merge pull request #1143 from lnbits/cashu ... Extension: Cashu	2022-11-27 17:55:30 +01:00
callebtc	7f64f426c2	Merge branch 'main' into cashu	2022-11-27 17:40:55 +01:00
callebtc	677c7710fd	fix padding of bottom bar	2022-11-27 17:38:52 +01:00
callebtc	c5a37a05f4	fix padding of bottom bar	2022-11-27 17:33:24 +01:00
Arc	fd2c8f307a	Merge pull request #1150 from lnbits/lnurldeviceswitchupdate ... Adds websocket checker to lnurldevice switch	2022-11-26 22:53:42 +00:00
ben	aa8c543325	Added websocket checker for switch	2022-11-26 22:46:46 +00:00
ben	988c7eb7b4	Added websocket test	2022-11-26 21:36:11 +00:00
callebtc	e3187a1d89	lock cashu version	2022-11-26 15:26:32 +01:00
callebtc	9864f2a19c	update cashu	2022-11-26 03:01:06 +01:00
callebtc	3e68d897ed	consider bool	2022-11-26 02:21:07 +01:00
callebtc	05d59cd7fa	add correct mock data	2022-11-26 02:15:18 +01:00
callebtc	0735b5bf7d	update to cashu 0.5.3 with db fix	2022-11-26 02:14:39 +01:00
callebtc	d37d94f509	skip dbversions	2022-11-26 01:31:32 +01:00
callebtc	d5b4fca17f	pass migrations	2022-11-26 01:14:31 +01:00
callebtc	3661514adb	pass migrations	2022-11-26 01:14:06 +01:00