2706 commits

Author	SHA1	Message	Date
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	5c09469d61	Revert "Extension: Cashu"	2022-11-27 18:03:20 +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
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	9864f2a19c	update cashu	2022-11-26 03:01:06 +01:00
callebtc	0735b5bf7d	update to cashu 0.5.3 with db fix	2022-11-26 02:14:39 +01:00
Arc	e1dfdbba76	Merge pull request #1148 from motorina0/satspay_fix ... fix `staspay` webhook for LN payment	2022-11-25 07:29:34 -08:00
Vlad Stan	44754df991	refactor: remove single use var	2022-11-25 14:37:26 +02:00
Vlad Stan	cd53f9930b	chore: update comment	2022-11-25 14:37:02 +02:00
Vlad Stan	3178b79fe4	chore: format code	2022-11-25 14:31:00 +02:00
Vlad Stan	15c257fd65	fix: object is not subscriable	2022-11-25 14:20:56 +02:00
Vlad Stan	1a9cd81ee9	fix: persist webhook call status	2022-11-25 14:12:13 +02:00
Vlad Stan	ead710e591	fix: important info, should be visible in the logs	2022-11-25 11:32:30 +02:00
Vlad Stan	1aecedac84	refactor: move business logic logic to helpers.py	2022-11-25 11:25:40 +02:00
Vlad Stan	6f5c9a7798	chore: code clean-up	2022-11-25 11:06:45 +02:00
Vlad Stan	5440d4ab19	feat: store onchain charge config with the charge	2022-11-25 10:48:57 +02:00
Vlad Stan	4e984eae56	fix: center back button	2022-11-24 17:39:40 +02:00
Vlad Stan	3356bab5ca	fix: refresh when both onchain and ln are present	2022-11-24 17:33:58 +02:00
Vlad Stan	d3c3622d22	fix: mempool hostname	2022-11-24 17:20:12 +02:00
Vlad Stan	00ba09d201	fix: remove wallet inkey	2022-11-24 17:08:32 +02:00
callebtc	7bfd8f3a62	overwrite mock data	2022-11-24 16:08:12 +01:00
Vlad Stan	fdfd9b1d9f	fix: call webhook in the background (from the task.py)	2022-11-24 16:57:59 +02:00
Vlad Stan	a641ef4836	refactor: remove duplicate code	2022-11-24 16:55:35 +02:00
callebtc	179ac940e2	mypy	2022-11-24 15:25:37 +01:00