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
|
04c77be523
|
bump cashu to 0.5.5
|
2022-12-01 12:21:25 +01:00 |
|
callebtc
|
86fbd2844d
|
remove debug print
|
2022-12-01 12:21:25 +01:00 |
|
callebtc
|
8dc4e5faff
|
remove codecov
|
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 |
|
Arc
|
3966f2602d
|
Revert "Revert "update requirements""
|
2022-12-01 12:21:25 +01:00 |
|
Arc
|
fe379f60d1
|
Revert "update requirements"
|
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 |
|
callebtc
|
090a449037
|
update requirements
|
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 |
|
ben
|
cbd939f35b
|
Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css"
This reverts commit f98278fabaffef1ffacf0b8c84e8c1ca166e8ae8.
|
2022-12-01 12:21:25 +01:00 |
|