Commit Graph
4031 Commits
Author SHA1 Message Date
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
Tiago Vasconcelos f7dd533daa make ad space as a CSV formatted string 2022-12-01 22:16:55 +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
callebtcanddni ⚡ 04c77be523 bump cashu to 0.5.5 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 86fbd2844d remove debug print 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 8dc4e5faff remove codecov 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 33eb460d5c restore 7f64f426c2 2022-12-01 12:21:25 +01:00
benanddni ⚡ f8647aa5d5 Fixed css 2022-12-01 12:21:25 +01:00
Arcanddni ⚡ 3966f2602d Revert "Revert "update requirements"" 2022-12-01 12:21:25 +01:00
Arcanddni ⚡ fe379f60d1 Revert "update requirements" 2022-12-01 12:21:25 +01:00
ChuckNorrisonanddni ⚡ b3a86875a2 add missing f-string for SQL 2022-12-01 12:21:25 +01:00
ChuckNorrisonanddni ⚡ 11c6137017 add missing f-string for SQL 2022-12-01 12:21:25 +01:00
calleanddni ⚡ 3ed8cb986c Update migrations.py 2022-12-01 12:21:25 +01:00
calleanddni ⚡ 8034c477ab Update migrations.py
f string
2022-12-01 12:21:25 +01:00
calleanddni ⚡ f1418da52f Update migrations.py
f string
2022-12-01 12:21:25 +01:00
ChuckNorrisonanddni ⚡ 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 Vasconcelosanddni ⚡ 3ff14cb71b change status code to 400 on exception 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 872d5a6702 use isinstance, not type 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 92435e8492 rewrite values in db 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ c901a5c69d strip html 2022-12-01 12:21:25 +01:00
callebtcanddni ⚡ 090a449037 update requirements 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ e3050062f3 fix: show completelink in the absence of webhook 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 44759d23ae fix: show completelink in the absence of webhook 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 92bb0979d2 feat: add Advanced toggle 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 338462af78 feat: move custom css next to the other optional fileds 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 5d1d13765d fix: custom css is optional 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ d8c34690eb fix: merge leftover 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 04a5d834d2 fix: merge bug 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ c1890d4b4c fix: SQL syntax 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 431bfd6c09 fix: sql insert 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 0dbd91048f fix: rebase clean-up 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ cc6648df85 fix: quote user column 2022-12-01 12:21:25 +01:00
Vlad Stananddni ⚡ 798dc73fc8 fix: timestamp does not exist on themes 2022-12-01 12:21:25 +01:00
benanddni ⚡ 317ddec705 isort 2022-12-01 12:21:25 +01:00
benanddni ⚡ 9d1a8b839d Primary key 2022-12-01 12:21:25 +01:00
benanddni ⚡ ce41e4b689 formatting 2022-12-01 12:21:25 +01:00
benanddni ⚡ 2fcf2153c3 adding missing css to public_charge 2022-12-01 12:21:25 +01:00
benanddni ⚡ 13d2c93007 Added lost return 2022-12-01 12:21:25 +01:00
benanddni ⚡ fd7a5ca465 resolving conflict errors 2022-12-01 12:21:25 +01:00
benanddni ⚡ 11b743a905 Trying to fix conflict errors 2022-12-01 12:21:25 +01:00
benanddni ⚡ 742bbc9112 Added back custom_css 2022-12-01 12:21:25 +01:00
benanddni ⚡ 003288e19d added back custom css to public page 2022-12-01 12:21:25 +01:00
benanddni ⚡ 2c2558b9e1 fixed admin check 2022-12-01 12:21:25 +01:00
benanddni ⚡ 76c2a87577 Auto stash before checking out "HEAD" 2022-12-01 12:21:25 +01:00