3764 Commits

Author	SHA1	Message	Date
Lee Salminen	3ca9edeee6	WIP nostr nip5 extension	2022-12-20 06:28:43 -06:00
dni ⚡	29869cfcda	formatting	2022-12-20 13:18:37 +01:00
dni ⚡	22cafe9ed0	remove uneeded if	2022-12-20 13:17:07 +01:00
dni ⚡	c90f7878d7	fix usermanager mypy	2022-12-20 13:14:49 +01:00
Vlad Stan	c5fdd35078	feat: store mor info about the webhook call status	2022-12-20 13:32:03 +02:00
Vlad Stan	681883a8f9	fix: catch all exceptions for webhook	2022-12-20 13:32:03 +02:00
Tiago Vasconcelos	9b69851155	Merge remote-tracking branch 'origin/diagon-alley' into diagon-alley	2022-12-20 09:53:54 +00:00
Tiago Vasconcelos	7a1ec09104	add toast on add to cart	2022-12-20 09:53:37 +00:00
ben	4d2f9facee	fixed message box	2022-12-20 08:51:07 +00:00
ben	64bf0c406b	messages max height	2022-12-20 08:48:42 +00:00
ben	9e03c05bcc	Whoops	2022-12-20 08:44:59 +00:00
ben	3038b4be86	removed key need	2022-12-20 08:44:22 +00:00
ben	1bf05df4a9	removed	2022-12-20 08:43:22 +00:00
ben	1a820b4dac	v-if all diagonalley things	2022-12-20 08:42:11 +00:00
ben	5765c3c8c9	renamed folder	2022-12-20 08:35:17 +00:00
ben	fa23eeb055	improved description	2022-12-20 08:32:54 +00:00
ben	e1cad034a2	Fixed toggle, made description more generic	2022-12-20 08:25:42 +00:00
ben	2a89743a3d	Renamed DA to shop	2022-12-20 08:21:48 +00:00
ben	955eace387	Merge remote-tracking branch 'origin/main' into gerty	2022-12-20 08:18:13 +00:00
ben	8ba380fcbd	format	2022-12-19 23:34:54 +00:00
Tiago Vasconcelos	8fdebc2a98	Merge branch 'main' into diagon-alley	2022-12-19 15:56:17 +00:00
Tiago Vasconcelos	8381e32148	add diagonally mode toggle	2022-12-19 15:29:02 +00:00
Tiago Vasconcelos	105d6b7964	rename extension to Shop	2022-12-19 15:21:35 +00:00
callebtc	7650d5775f	backwards compatible	2022-12-19 15:54:31 +01:00
callebtc	385cda47cf	fix cln setting	2022-12-19 15:48:55 +01:00
ben	e69f2be1f0	format	2022-12-19 13:24:08 +00:00
ben	53be745737	Bad env calls	2022-12-19 13:22:53 +00:00
ben	fcaf6967fa	Merge branch 'main' into gerty	2022-12-19 13:03:19 +00:00
Vlad Stan	1d509fb9d2	fix: typo Setings -> Settings	2022-12-19 11:07:24 +02:00
Vlad Stan	1f3dff16fb	fix: wrong permission required	2022-12-19 11:07:02 +02:00
ben	65419b1b4b	Merge remote-tracking branch 'origin/main' into diagon-alley	2022-12-17 15:04:51 +00:00
ben	04bc6c8975	Merge branch 'main' into gerty	2022-12-17 10:12:53 +00:00
ben	604c0a4ee9	Merge remote-tracking branch 'origin/main' into fix/boltcard_errors	2022-12-17 10:01:12 +00:00
Arc	2b7c2a0c28	Merge pull request #1005 from iWarpBTC/ext-boltcards_keys ... Boltcard ext upgrade	2022-12-17 09:57:35 +00:00
dni ⚡	ffe0a77106	fix admin ui only have superuser to topup	2022-12-17 09:52:07 +01:00
Arc	d3548926b8	Merge pull request #1200 from lnbits/fix/paywall_button ... remove icon add button for better UX	2022-12-16 23:19:33 +00:00
ben	85dbab14f9	isort	2022-12-16 23:13:20 +00:00
Arc	6140358fa2	Merge pull request #1195 from lnbits/switchpasstag ... Adds tags to splitpayments	2022-12-16 23:10:27 +00:00
ben	8f00e35d1e	Merge branch 'main' into gerty	2022-12-16 23:02:45 +00:00
ben	940615cb0b	Merge branch 'main' into FinalAdminUI	2022-12-16 22:45:54 +00:00
ben	6b69c0f3e4	Fixed theme options ... Prop needed to be persisted	2022-12-16 22:44:18 +00:00
callebtc	5d4e1dd9bb	fix: rename variable	2022-12-16 17:34:05 +01:00
callebtc	ac87c49603	fix: disable compression	2022-12-16 17:18:02 +01:00
ben	68bcfadd42	Added servers to check	2022-12-16 12:38:14 +00:00
Gene Takavic	7b7a731021	reducing the PR	2022-12-16 11:55:47 +01:00
Gene Takavic	75561bd930	some minors	2022-12-16 11:51:37 +01:00
ben	2403d0adfb	adding urls	2022-12-16 10:36:49 +00:00
Vlad Stan	dc0c4564af	fix: merge conflict	2022-12-16 12:27:26 +02:00
Vlad Stan	2eeef5c1ed	Merge branch 'main' into FinalAdminUI	2022-12-16 12:21:25 +02:00
Gene Takavic	a916c1ac73	reducing the PR	2022-12-16 11:17:59 +01:00
Gene Takavic	e7fdd31cda	Merge branch 'main' into ext-boltcards_keys	2022-12-16 11:14:04 +01:00
Vlad Stan	c9745f849e	fix: mypy	2022-12-16 12:14:00 +02:00
Vlad Stan	1751831e57	fix: create default wallet for auto created super_user	2022-12-16 12:09:13 +02:00
Gene Takavic	3aee76be39	reducing the PR	2022-12-16 11:09:10 +01:00
Vlad Stan	d596992993	feat: .env super_user overwrites DB super_user	2022-12-16 11:22:32 +02:00
Vlad Stan	d6757ed2cf	chore: code format	2022-12-16 10:29:53 +02:00
Vlad Stan	4ee68628cc	fix: use super_admin from .env if present	2022-12-16 10:29:43 +02:00
ben	731544492e	market link broken	2022-12-15 23:47:31 +00:00
ben	d4d5b7a14d	Merge branch 'main' into diagon-alley	2022-12-15 23:33:07 +00:00
ben	1357b17b64	keys now working	2022-12-15 23:32:49 +00:00
ben	495719c366	MVP working	2022-12-15 23:12:13 +00:00
Gene Takavic	b8bd9cc807	format	2022-12-15 16:46:49 +01:00
Gene Takavic	90679f54ee	handling some errors	2022-12-15 16:28:17 +01:00
Tiago Vasconcelos	6a44ac3425	fix button type	2022-12-15 14:56:30 +00:00
ben	ee79bdcfc8	Merge remote-tracking branch 'origin/main' into gerty	2022-12-15 14:50:48 +00:00
ben	2e786e63bf	Pretty much everything loading in software Gerty	2022-12-15 14:50:32 +00:00
Tiago Vasconcelos	210c736181	remove icon add button for better UX	2022-12-15 14:41:24 +00:00
ben	eb9ec21c89	Spagetthi, needs cleaning and refactor	2022-12-15 11:16:19 +00:00
ben	cde7e4a5e9	added wallet colors	2022-12-15 10:51:29 +00:00
callebtc	cef4244bfc	update to cashu 0.6.0	2022-12-15 00:33:24 +01:00
callebtc	78f94483d0	fix: no stacktrace for validartion errors	2022-12-14 19:10:26 +01:00
callebtc	5b8c5d52da	fix: no stack trace for http errors	2022-12-14 19:09:01 +01:00
callebtc	317c17c1b3	make format	2022-12-14 18:42:45 +01:00
callebtc	4a060baa75	feat: error responses work	2022-12-14 18:40:07 +01:00
Tiago Vasconcelos	7b274433d0	disable topup for non super user admin	2022-12-14 16:09:27 +00:00
ben	475ff47f5b	isort	2022-12-14 14:56:04 +00:00
ben	60a01cd89a	fomrat	2022-12-14 14:53:09 +00:00
ben	59c6469bd1	generalised tag search	2022-12-14 14:43:41 +00:00
ben	7ce2587bdb	gerty lnbits walllet working	2022-12-14 14:07:05 +00:00
callebtc	fa7bbb62e2	correct error codes in tests	2022-12-14 14:59:11 +01:00
callebtc	b5eb8b7ee8	add handler for RequestValidationError	2022-12-14 14:33:13 +01:00
callebtc	f47772d528	fix: fastapi exception handling and printing	2022-12-14 14:18:42 +01:00
ben	4c3db72afc	Added ID	2022-12-14 00:31:09 +00:00
ben	7b2b1de681	Merge branch 'main' into switchpasstag	2022-12-14 00:18:46 +00:00
ben	75e6252d23	formatted	2022-12-14 00:06:36 +00:00
ben	f506b010f6	Working	2022-12-14 00:04:03 +00:00
ben	5f53eb8e4e	tagged working	2022-12-13 23:41:40 +00:00
ben	c91b5031bf	migration working	2022-12-13 20:17:52 +00:00
ben	e161c5d116	fixed migration	2022-12-13 20:11:07 +00:00
ben	100cf17e4b	fixed percent	2022-12-13 20:07:16 +00:00
ben	2e69ebe080	Seems to be working	2022-12-13 20:01:05 +00:00
calle	cc60e11226	Merge pull request #1193 from lnbits/fix/cashu/status_check ... Cashu fix: log status check	2022-12-13 17:16:07 +01:00
callebtc	a7f572f455	typo	2022-12-13 17:15:44 +01:00
Gene Takavic	afe07ad0ba	fix get_hits, get_refunds	2022-12-13 15:27:28 +01:00
ben	d69c2e9170	moved to tag changed	2022-12-13 14:25:18 +00:00
ben	5539a82b4a	Added tag	2022-12-13 13:42:09 +00:00
Vlad Stan	6ccc783377	feat: store & show webhook response body	2022-12-13 13:36:21 +02:00
dni ⚡	02946c1d1c	remove old topup route using new one, change wallet.js handling of that url	2022-12-13 10:17:40 +01:00
callebtc	285bf497b6	fix: log status check	2022-12-12 23:16:31 +01:00
ben	52d490d687	struggling with ui	2022-12-12 12:44:58 +00:00
dni ⚡	04f0f5b83b	improve wording	2022-12-12 12:27:52 +01:00
Vlad Stan	50a509dfc3	chore: code-format	2022-12-12 11:36:24 +02:00
Vlad Stan	9e61c80d02	feat: move Admin to left hand side menu	2022-12-12 11:31:29 +02:00
Vlad Stan	6a80f7c713	chore: code formatting	2022-12-12 10:52:01 +02:00
Vlad Stan	6cab77ece4	Merge branch 'main' into FinalAdminUI	2022-12-12 10:49:31 +02:00
dni ⚡	ab49b7740c	add superuser decorator, fix restart route and mypy issue	2022-12-12 09:45:12 +01:00
Vlad Stan	53af4a4b99	fix: only super-user should be able to restart	2022-12-12 10:34:23 +02:00
Vlad Stan	b758cb5be3	fix: remove super_admin from lnbits_admin_users	2022-12-12 10:28:53 +02:00
Vlad Stan	63ea3369d3	fix: do not hide Exception message	2022-12-12 10:20:27 +02:00
Vlad Stan	7e2b1e65a0	fix: super-user is a special read-only value that is logged to the console	2022-12-12 10:12:35 +02:00
Vlad Stan	bed2eff7fb	fix: send_admin_user_to_saas is not a settings method	2022-12-12 09:45:08 +02:00
calle	5d6d1fb87f	Merge pull request #1033 from lnbits/startup/skip_invoice_expriy_check ... On-the-fly invoice expiry check	2022-12-11 11:54:11 +01:00
callebtc	c949e8a299	feat: add copy token button	2022-12-11 01:36:03 +01:00
callebtc	a50dd80ad5	feat: display mint name	2022-12-11 00:59:07 +01:00
ben	4e6466cd95	Started adding ability to forward by tag	2022-12-09 14:10:10 +00:00
Vlad Stan	3288722ef4	refactor: spit ReadOnlySettings	2022-12-09 15:13:58 +02:00
Vlad Stan	e28dea97d8	fix: update the in-memory settings object when the DB is updated	2022-12-09 14:53:51 +02:00
Vlad Stan	6252119485	fix: add super_user to the lnbits_admin_users list	2022-12-09 14:53:09 +02:00
Vlad Stan	84a24c389f	feat: add Admin Console icon	2022-12-09 14:27:32 +02:00
Vlad Stan	b5a39e32c3	fix: old env variables	2022-12-09 14:13:41 +02:00
Vlad Stan	99e7bf5cd0	chore: code format	2022-12-09 14:09:16 +02:00
Vlad Stan	4cd2fe7ee1	Merge branch 'main' into FinalAdminUI	2022-12-09 14:06:47 +02:00
Vlad Stan	49855669a5	refactor: move init logic at the bottom	2022-12-09 13:40:22 +02:00
Vlad Stan	6d1db80bb3	refactor: build dynamically readonly_variables	2022-12-09 13:37:36 +02:00
Vlad Stan	d6d42250a9	refactor: use JSON for settings	2022-12-09 13:14:22 +02:00
Vlad Stan	0ed2ec6519	refactor: extract funding sources to their own classes	2022-12-09 11:35:46 +02:00
Vlad Stan	68b4a20e26	feat: enable validator for ReadonlySettings	2022-12-09 11:06:43 +02:00
Vlad Stan	7952a462e3	feat: extract parent LNbitsSetings class	2022-12-09 10:57:53 +02:00
Vlad Stan	60bb556f2c	fix: log init exceptions	2022-12-09 10:31:29 +02:00
Vlad Stan	0d4954c01a	chore: temp commit (does not work); don't want to lose changes	2022-12-09 09:46:30 +02:00
ben	b6db683f30	Merge remote-tracking branch 'origin/main' into gerty	2022-12-08 13:45:50 +00:00
ben	c239c4f552	Endpoints working	2022-12-08 13:45:38 +00:00
Vlad Stan	d15782521d	refactor: include admin extension into core	2022-12-08 15:41:52 +02:00
callebtc	0538035084	msat values are ints	2022-12-08 14:33:52 +01:00
Tiago Vasconcelos	61c3476ba7	fix display columns for hide api and or ad space	2022-12-08 11:46:44 +00:00
ben	8e6eb63c9e	Added dashboards	2022-12-08 11:42:51 +00:00
ben	54c1757423	adding checkboxes for dashboards	2022-12-08 11:10:09 +00:00
callebtc	0927bc582f	just site title	2022-12-08 11:54:28 +01:00
callebtc	8c27561a3f	fix for #1182	2022-12-08 11:44:43 +01:00
Tiago Vasconcelos	0706ceed12	restrict non super user admins actions	2022-12-08 10:35:13 +00:00
Tiago Vasconcelos	04017c9730	remove super user id	2022-12-08 10:34:42 +00:00
Tiago Vasconcelos	5797f0a77d	clean up logs	2022-12-08 10:34:27 +00:00
ben	08ed86fb18	Shuffling UI, trying to ditch variables	2022-12-08 10:24:37 +00:00
Tiago Vasconcelos	301cc6229e	remove lnbits_admin_extensions from readonly variables	2022-12-08 10:15:34 +00:00
ben	53e910d549	Merge branch 'main' into gerty	2022-12-07 15:38:06 +00:00
dni ⚡	b4e8659006	fix default value for reserve fee ... format	2022-12-07 15:58:33 +01:00
callebtc	ab4a9370e7	style: make format	2022-12-07 14:57:10 +01:00
callebtc	5f4fa61310	refactor:depend_admin_user	2022-12-07 14:56:45 +01:00
calle	386e1ec4d9	Merge pull request #1171 from lnbits/fix/audit_endpoint ... Fix: audit endpoint	2022-12-07 14:22:39 +01:00
dni ⚡	89933c2d30	test should pass now, WALLET is initialised after the settings are loaded from db.	2022-12-07 13:38:33 +01:00
Arc	ee874a4a80	Merge pull request #1154 from iWarpBTC/tpos/user-agent ... TPOS identifies itself via user-agent	2022-12-07 11:00:48 +00:00
ben	44d7435163	format	2022-12-07 10:42:48 +00:00
dni ⚡	35536dde9b	missing LNBITS_ADMIN_EXTENSIONS and fix update bug	2022-12-07 11:30:03 +01:00
ben	97565fde02	Adds PoS websocket endpoint ... Receives all payments to a pos	2022-12-07 10:21:45 +00:00
dni ⚡	c0fc53028b	reformatting	2022-12-07 11:02:23 +01:00
dni ⚡	c189ec49e5	add superuser class to obscure superuser_id for admin in the ui	2022-12-07 11:00:48 +01:00
ben	9971a560e1	Trying to catchup with main	2022-12-06 20:35:58 +00:00
callebtc	e15cfeb943	print only if migration takes place	2022-12-06 21:05:09 +01:00
callebtc	6eb9c5d9ee	better sort sql clause	2022-12-06 21:04:10 +01:00
callebtc	6f5f7753ef	fix audit endpoint	2022-12-06 20:58:09 +01:00
Tiago Vasconcelos	02e82a8fdf	fix add user and admins-WIP remove super user id from API	2022-12-06 16:08:21 +00:00
callebtc	3bb11dc487	separate migrations	2022-12-06 16:21:19 +01:00
dni ⚡	344e951368	remove unused comment, and drop readonly settings on update	2022-12-06 15:30:53 +01:00
callebtc	36cebffbf5	clean migration	2022-12-06 13:23:51 +01:00
callebtc	07724eaa0f	clean up if clause	2022-12-06 13:21:34 +01:00
callebtc	269ea0f975	optional expiry (float now) in Payment model	2022-12-06 13:08:36 +01:00
dni ⚡	f2da8fc277	fix another super_user permission issue	2022-12-06 13:04:27 +01:00
dni ⚡	aafb2335a1	fix check_admin issue, wrong condition	2022-12-06 12:45:26 +01:00
dni ⚡	d2cd972663	refactor from settings.py into admin crud, but broke frontend ... formatting	2022-12-06 11:02:01 +01:00
callebtc	8c324d8634	make format	2022-12-06 10:48:34 +01:00
callebtc	441d5337a3	fix expiry integer	2022-12-06 10:48:16 +01:00
dni ⚡	c56a31e6f5	add superuser and refactor check_admin function, also put it into satspay	2022-12-05 20:41:23 +01:00
dni ⚡	9d67c8e4e5	checks, redundant error handling	2022-12-05 17:50:13 +01:00
dni ⚡	e49112d4ee	rename read_only_variables to readonly_variables	2022-12-05 16:13:26 +01:00
dni ⚡	9b37c68b7c	calle, change logger.warning messages	2022-12-05 16:10:35 +01:00
dni ⚡	35920bae48	code improvements, bugfixes	2022-12-05 15:43:26 +01:00
dni ⚡	12b0ec138d	removed unused file	2022-12-05 15:37:01 +01:00
dni ⚡	b4126e664b	nitpicks from vlad	2022-12-05 12:28:26 +01:00
dni ⚡	04b67c3551	WALLET outside of loop	2022-12-05 12:20:37 +01:00
dni ⚡	9e60b5374c	fake wallet queue issue	2022-12-05 12:18:59 +01:00
callebtc	befdeb040e	add expiry to frontend	2022-12-02 19:05:22 +01:00
callebtc	32448c4b0c	on-the-fly deletion	2022-12-02 18:55:53 +01:00
callebtc	167c2ce9f1	make format	2022-12-02 18:51:52 +01:00
callebtc	7a6450f032	add expiry to Payment model	2022-12-02 18:51:18 +01:00
callebtc	2134b63cea	readd comments	2022-12-02 17:48:47 +01:00
callebtc	1a98f15d48	remove STARTUP_INVOICE_EXPIRY_CHECK	2022-12-02 17:39:56 +01:00
callebtc	4e69924c9c	fix datetime conversion	2022-12-02 17:38:36 +01:00
Tiago Vasconcelos	c3e6ed9089	fix for default ad image URL	2022-12-02 14:59:02 +00:00
Tiago Vasconcelos	fe5e1241bf	fix some of Vlad's review comments	2022-12-02 14:52:31 +00:00
Tiago Vasconcelos	52cbc7d0f7	make format	2022-12-02 14:38:21 +00:00
Tiago Vasconcelos	4410968bf5	enable disable ads and display ads	2022-12-02 14:36:09 +00:00
Vlad Stan	f7061da361	chore: code clean-up	2022-12-02 14:02:59 +02:00
Vlad Stan	88035305c5	fix: hide New Payment button	2022-12-02 13:46:51 +02:00
Vlad Stan	8b0c004883	feat: allow external signed PSBT	2022-12-02 13:41:26 +02:00
Vlad Stan	3ad0463dfe	feat: extract utxos. from PSBT	2022-12-02 13:40:59 +02:00
callebtc	79ffbb7bc2	merge main	2022-12-02 11:23:20 +01:00
Tiago Vasconcelos	f7dd533daa	make ad space as a CSV formatted string	2022-12-01 22:16:55 +00:00
ben	44e12f9d3a	updated dev article	2022-12-01 19:04:05 +00:00
ben	9a50f4187e	isort	2022-12-01 18:45:00 +00:00
ben	8ca390e0b0	format	2022-12-01 18:41:58 +00:00
ben	694a4e5054	replaced extension specific websockets with the generic websocket	2022-12-01 18:31:58 +00:00
Arc	1f31495634	Merge pull request #1146 from lnbits/universalwebsocket ... Adds universal websocket manager any extension can use	2022-12-01 14:55:40 +00:00
benarc	a220acb583	Removed id, using param instead	2022-12-01 14:41:57 +00:00
benarc	4aeb7683e5	Added Response	2022-12-01 13:15:46 +00:00
benarc	31b30cacd4	Merge branch 'main' into universalwebsocket	2022-12-01 12:42:01 +00:00
Arc	69ef0f2bb1	Merge pull request #1160 from blackcoffeexbt/bugfix/lnbits-casing ... LNbits casing fixes	2022-12-01 12:24:27 +00:00
dni ⚡	0a47b63597	fix satspay merge error	2022-12-01 13:08:08 +01:00
Tiago Vasconcelos	59deca7b6f	Merge remote-tracking branch 'origin/FinalAdminUI' into FinalAdminUI	2022-12-01 11:52:08 +00:00
Tiago Vasconcelos	e09b31de7c	change ad space inputs	2022-12-01 11:51:54 +00:00
dni ⚡	803c9349d4	merge main	2022-12-01 12:37:08 +01:00
dni ⚡	4702448ecf	fix satspay settings	2022-12-01 12:28:28 +01:00
callebtc	86fbd2844d	remove debug print	2022-12-01 12:21:25 +01:00
callebtc	33eb460d5c	restore 7f64f426c2	2022-12-01 12:21:25 +01:00
ben	f8647aa5d5	Fixed css	2022-12-01 12:21:25 +01:00
ChuckNorrison	b3a86875a2	add missing f-string for SQL	2022-12-01 12:21:25 +01:00
ChuckNorrison	11c6137017	add missing f-string for SQL	2022-12-01 12:21:25 +01:00
calle	3ed8cb986c	Update migrations.py	2022-12-01 12:21:25 +01:00
calle	8034c477ab	Update migrations.py ... f string	2022-12-01 12:21:25 +01:00
calle	f1418da52f	Update migrations.py ... f string	2022-12-01 12:21:25 +01:00
ChuckNorrison	b23b3634f6	fix integer to bigint for extensions ... Some more INTEGER to BIGINT conversion for postgresql database	2022-12-01 12:21:25 +01:00
Tiago Vasconcelos	3ff14cb71b	change status code to 400 on exception	2022-12-01 12:21:25 +01:00
callebtc	872d5a6702	use isinstance, not type	2022-12-01 12:21:25 +01:00
callebtc	92435e8492	rewrite values in db	2022-12-01 12:21:25 +01:00
callebtc	c901a5c69d	strip html	2022-12-01 12:21:25 +01:00
Vlad Stan	e3050062f3	fix: show completelink in the absence of webhook	2022-12-01 12:21:25 +01:00
Vlad Stan	44759d23ae	fix: show completelink in the absence of webhook	2022-12-01 12:21:25 +01:00
Vlad Stan	92bb0979d2	feat: add Advanced toggle	2022-12-01 12:21:25 +01:00
Vlad Stan	338462af78	feat: move custom css next to the other optional fileds	2022-12-01 12:21:25 +01:00
Vlad Stan	5d1d13765d	fix: custom css is optional	2022-12-01 12:21:25 +01:00
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