2809 Commits

Author	SHA1	Message	Date
Vlad Stan	d8c34690eb	fix: merge leftover	2022-12-01 12:21:25 +01:00
Vlad Stan	04a5d834d2	fix: merge bug	2022-12-01 12:21:25 +01:00
Vlad Stan	c1890d4b4c	fix: SQL syntax	2022-12-01 12:21:25 +01:00
Vlad Stan	431bfd6c09	fix: sql insert	2022-12-01 12:21:25 +01:00
Vlad Stan	0dbd91048f	fix: rebase clean-up	2022-12-01 12:21:25 +01:00
Vlad Stan	cc6648df85	fix: quote user column	2022-12-01 12:21:25 +01:00
Vlad Stan	798dc73fc8	fix: timestamp does not exist on themes	2022-12-01 12:21:25 +01:00
ben	317ddec705	isort	2022-12-01 12:21:25 +01:00
ben	9d1a8b839d	Primary key	2022-12-01 12:21:25 +01:00
ben	ce41e4b689	formatting	2022-12-01 12:21:25 +01:00
ben	2fcf2153c3	adding missing css to public_charge	2022-12-01 12:21:25 +01:00
ben	13d2c93007	Added lost return	2022-12-01 12:21:25 +01:00
ben	fd7a5ca465	resolving conflict errors	2022-12-01 12:21:25 +01:00
ben	11b743a905	Trying to fix conflict errors	2022-12-01 12:21:25 +01:00
ben	742bbc9112	Added back custom_css	2022-12-01 12:21:25 +01:00
ben	003288e19d	added back custom css to public page	2022-12-01 12:21:25 +01:00
ben	2c2558b9e1	fixed admin check	2022-12-01 12:21:25 +01:00
ben	76c2a87577	Auto stash before checking out "HEAD"	2022-12-01 12:21:25 +01:00
ben	1a17c04246	removed compact_charge	2022-12-01 12:21:25 +01:00
ben	754aa637b9	added back crud	2022-12-01 12:21:25 +01:00
ben	08747f1cb6	only allows admins to use custom themes	2022-12-01 12:21:25 +01:00
ben	cbd939f35b	Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css" ... This reverts commit f98278faba.	2022-12-01 12:21:25 +01:00
callebtc	824baa4f2a	use isinstance, not type	2022-12-01 12:21:25 +01:00
callebtc	2ec150fd13	rewrite values in db	2022-12-01 12:21:25 +01:00
callebtc	6d16ac0f0a	strip html	2022-12-01 12:21:25 +01:00
ben	700196a5a9	Now you can have multiple themes	2022-12-01 12:21:25 +01:00
Black Coffee	b2e8bed24c	run isort and black	2022-12-01 12:21:25 +01:00
Black Coffee	72cf6b9b79	Change user to user_id in satspay settings table and fixed first use bug	2022-12-01 12:21:25 +01:00
Black Coffee	b51bc492fb	Remove console.log from satspay index.html	2022-12-01 12:21:25 +01:00
Black Coffee	29a503a0eb	Remove theme settings on satspay invoice page and default to blue theme to allow users to skin satspay invoice page more easily	2022-12-01 12:21:25 +01:00
Black Coffee	7bc660ea09	Removed unused custom css api call from display.html	2022-12-01 12:21:25 +01:00
Black Coffee	b34cfd2906	Custom CSS on SatsPay server working!:)	2022-12-01 12:21:25 +01:00
Black Coffee	487833f1f2	Settings now save and load and have an insert or delete for new / existing settings	2022-12-01 12:21:25 +01:00
Black Coffee	a63ec981f1	SatsPay server save custom css settings now working	2022-12-01 12:21:25 +01:00
Black Coffee	2b67169512	Added satspay settings migration	2022-12-01 12:21:25 +01:00
calle	2c562b7053	Revert "Extension: Cashu"	2022-12-01 12:21:25 +01:00
ben	cb042d0bd0	Added websocket checker for switch	2022-12-01 12:21:25 +01:00
ben	0a70af7e1e	Added websocket test	2022-12-01 12:21:25 +01:00
Vlad Stan	0326f3bb9e	refactor: remove single use var	2022-12-01 12:21:25 +01:00
Vlad Stan	ca0373406c	chore: update comment	2022-12-01 12:21:25 +01:00
Vlad Stan	179b884eb5	chore: format code	2022-12-01 12:21:25 +01:00
Vlad Stan	c7ffdfa8ac	fix: object is not subscriable	2022-12-01 12:21:25 +01:00
Vlad Stan	5a4726224c	fix: persist webhook call status	2022-12-01 12:21:25 +01:00
Vlad Stan	4319836195	fix: important info, should be visible in the logs	2022-12-01 12:21:25 +01:00
Vlad Stan	6c6d00fb8c	refactor: move business logic logic to helpers.py	2022-12-01 12:21:25 +01:00
Vlad Stan	e0f595775c	chore: code clean-up	2022-12-01 12:21:25 +01:00
Vlad Stan	871d716539	feat: store onchain charge config with the charge	2022-12-01 12:21:25 +01:00
Vlad Stan	bb16870c66	fix: center back button	2022-12-01 12:21:25 +01:00
Vlad Stan	2ca48a26a6	fix: refresh when both onchain and ln are present	2022-12-01 12:21:25 +01:00
Vlad Stan	683eb6992a	fix: mempool hostname	2022-12-01 12:21:25 +01:00