3531 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ben	9a9733c1ce	Auto stash before merge of "universalwebsocket" and "origin/universalwebsocket"	2022-11-29 11:23:34 +00:00
Arc	a7fd44f4ca	Merge branch 'main' into universalwebsocket	2022-11-29 11:12:28 +00:00
calle	fd696b1dc1	Merge pull request #1135 from ChuckNorrison/postgre-bigint ... fix integer to bigint for extensions	2022-11-29 12:11:07 +01:00
ben	2244508a8c	Merge remote-tracking branch 'origin/main' into universalwebsocket	2022-11-29 11:10:34 +00:00
calle	409b41bec6	Merge pull request #1155 from lnbits/fix/response_status_code_decode ... Send BAD REQUEST response	2022-11-29 12:10:10 +01:00
ben	31d9f2e2ee	Removed returns and reverted socket check so multiple clients can join	2022-11-29 11:09:54 +00:00
calle	f793b9e9fe	Merge pull request #1149 from lnbits/fix/strip_html_db ... Fix/strip_html_db	2022-11-29 12:09:04 +01:00
calle	34bd3c93b6	Merge pull request #1156 from lnbits/fix/update_requirements ... update requirements	2022-11-29 12:01:09 +01:00
callebtc	45c121c590	update requirements	2022-11-29 11:52:04 +01:00
Tiago Vasconcelos	b68172696d	change status code to 400 on exception	2022-11-29 10:28:19 +00:00
Arc	3b61700498	Merge pull request #1153 from motorina0/feature/satspay-server-custom-css_rebase01 ... satspay server custom css rebase01	2022-11-28 21:54:54 +00:00
ChuckNorrison	4f05c6c12e	add missing f-string for SQL	2022-11-28 19:02:31 +01:00
ChuckNorrison	f34e5496c0	add missing f-string for SQL	2022-11-28 19:00:43 +01:00
Vlad Stan	92f6c8c528	fix: show completelink in the absence of webhook	2022-11-28 17:00:29 +02:00
Vlad Stan	10ceac696b	fix: show completelink in the absence of webhook	2022-11-28 17:00:07 +02:00
Vlad Stan	5fc0910f6a	feat: add Advanced toggle	2022-11-28 16:59:47 +02:00
Vlad Stan	015f19fd0e	feat: move custom css next to the other optional fileds	2022-11-28 16:40:39 +02:00
Vlad Stan	3fbb6bb9e4	fix: custom css is optional	2022-11-28 16:37:42 +02:00
Vlad Stan	ce3eab9522	fix: merge leftover	2022-11-28 16:28:09 +02:00
Vlad Stan	0592c02c10	fix: merge bug	2022-11-28 16:17:18 +02:00
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
ben	187d709098	isort	2022-11-28 13:28:11 +00: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	bb84f6b0e8	Black	2022-11-28 13:24:10 +00: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