Commit Graph

3570 Commits

Author SHA1 Message Date
adbc4cde05 Remove default userinfo path 2022-07-12 13:48:07 -07:00
865e0f4305 Update .gitlab-ci.yml file 2022-07-12 08:12:45 +00:00
6c53162971 Update .gitlab-ci.yml file 2022-07-12 08:12:28 +00:00
b47127fd3f Merge branch 'dockerize' into 'master'
Dockerize

See merge request Jafner/calibre-web!5
2022-07-12 08:09:48 +00:00
e5fe6c7077 Merge branch 'oauth-userid-fix-pleasework' into 'master'
Update cps/ub.py, cps/admin.py, cps/templates/config_edit.html

See merge request Jafner/calibre-web!4
2022-07-12 08:08:15 +00:00
b3cb8a07cb Update cps/ub.py, cps/admin.py, cps/templates/config_edit.html 2022-07-12 08:07:43 +00:00
8532780832 Switch to short sha tagging 2022-07-12 07:40:44 +00:00
dac96ba101 Add missing /root 2022-07-12 00:31:12 -07:00
3e88c31c70 Install calibre-web properly 2022-07-12 07:16:17 +00:00
2a26e1f642 Copy CI and Dockerfile from jafner/docker-calibre-web 2022-07-12 07:07:43 +00:00
0b77cfa05e Merge branch 'oauth_table_fix_2_electricboogaloo' into 'master'
Update cps/ub.py

See merge request Jafner/calibre-web!3
2022-07-12 06:33:22 +00:00
ccef6c5bbf Update cps/ub.py 2022-07-12 06:32:55 +00:00
a3be6acf33 Merge branch 'oauth_table_fix' into 'master'
Try to fix weird OAuth Table BS...

See merge request Jafner/calibre-web!2
2022-07-12 06:22:16 +00:00
aa64a6ab23 Update cps/ub.py 2022-07-12 06:21:23 +00:00
32bc911de4 Merge branch 'Oauth-userid-config-add' into 'master'
Update cps/admin.py, cps/oauth_bb.py, cps/templates/config_edit.html, cps/ub.py

See merge request Jafner/calibre-web!1
2022-07-12 05:41:22 +00:00
826f362abb Update cps/admin.py, cps/oauth_bb.py, cps/templates/config_edit.html, cps/ub.py 2022-07-12 05:40:32 +00:00
d0e90de500 Fix second instance of hardcoded wrong userinfo path 2022-07-12 05:23:25 +00:00
889c075fb6 Hard-code Authentik userinfo path 2022-07-12 05:06:20 +00:00
8646b7438e Add NOT MY CODE blurb 2022-07-11 10:24:52 -07:00
94f4957c3d Add generic OAuth support to current 2022-07-10 17:34:12 -07:00
Ozzie Isaacs
07c67b09db Merge remote-tracking branch 'uk/master' 2022-06-18 18:45:12 +02:00
Ozzie Isaacs
02e1be09df Catch StaleDataError
Update requirements jsonschema
2022-06-13 17:54:35 +02:00
Ozzie Isaacs
f85b587d0a Prevent converting of kepub on every new user (#2446)
Added error logging message if convert fails
If convert only task, only convert book message is logged
2022-06-13 17:05:00 +02:00
Ozzie Isaacs
89d522e389 Fix for #2445 (book read status can't be set if custom column is linked and read status was set before) 2022-06-11 11:35:02 +02:00
Ozzie Isaacs
78b45f716a Bugfix for #2433 (LazyString is not JSON serializable if one of kepubify/ebook-convert/unrar is not installed) 2022-06-08 20:25:35 +02:00
Ozzie Isaacs
91df265d40 Fix for #2437 (advanced search for read status crashes calibre-web) 2022-06-08 17:17:07 +02:00
Illia Maier
7e7f54cfa7
Update Ukrainian translation
Update Ukrainian translation
2022-06-06 16:28:03 +03:00
Illia Maier
80bc14c0cf
Merge pull request #1 from Illia-M/Develop
Develop
2022-06-06 16:25:49 +03:00
Illia Maier
7685818b16
Update Ukrainian translation
Update Ukrainian translation
2022-06-06 14:37:07 +03:00
Ozzie Isaacs
f44d42f834 Merge remote-tracking branch 'opds/bugfix_2419'
Bugfix send emails
2022-06-06 09:00:09 +02:00
Ozzie Isaacs
25f2af3f03 Whitespaces are striped from email address (fixes #2432) 2022-06-05 10:06:43 +02:00
Ozzie Isaacs
909797dc49 Merge branch 'master' into Develop 2022-06-04 12:05:34 +02:00
Ozzie Isaacs
07d4e60655 Merge remote-tracking branch 'epub_theme/epub_themes' into Develop 2022-06-04 12:05:24 +02:00
Ozzie Isaacs
d90cfce97f Merge remote-tracking branch 'ldap/master' 2022-06-04 12:03:16 +02:00
Ozzie Isaacs
543fe12862 Merge remote-tracking branch 'epub_theme/epub_themes' 2022-06-04 09:26:01 +02:00
Ozzie Isaacs
4f66d6b3b1 Update ukranian translation 2022-06-04 08:49:48 +02:00
Illia Maier
c36138b144
Update Ukrainian translations 2022-06-03 08:59:18 +03:00
Thore Schillmann
7f6e88ce5e fixes bug 2419 2022-06-01 22:06:28 +02:00
Ozzie Isaacs
aa442d8c51 Update flask-login requirement 2022-05-31 19:22:57 +02:00
Aisha Tammy
a3cd217cea allow @ in auto username detection
Signed-off-by: Aisha Tammy <aisha@bsd.ac>
2022-05-25 12:14:09 -04:00
Ozzieisaacs
790080f2a0 Fix Cache Buster 2022-05-22 12:49:00 +01:00
Ozzieisaacs
4ea80e9810 Code cosmetics 2022-05-21 21:52:59 +01:00
Ozzieisaacs
034d57134d Merge remote-tracking branch 'convert/master' 2022-05-21 22:27:53 +02:00
Ozzieisaacs
f6101fd462 Merge remote-tracking branch 'links/patch-1' 2022-05-21 22:25:49 +02:00
Ozzieisaacs
1fa7de397a Merge remote-tracking branch 'cve/patch-1' 2022-05-21 22:22:02 +02:00
leexia
3b7cd38d5e Fix grammar mistake 2022-05-16 13:59:35 +08:00
ImanSharaf
78fb7a9756
Update SECURITY.md
I am the person who has reported the SQLi problem. I contacted the MITRE and they have given me this CVE number: CVE-2022-30765
2022-05-15 19:00:16 -07:00
Ozzie Isaacs
8a6a8dcbe8 Transfer gevent errors to log file
Transfer warnings from warnings module to logfile (#2394)
2022-05-09 19:47:43 +02:00
Ozzie Isaacs
fbac3e38ac Eenabled send epubs to E-Reader devices 2022-05-08 12:55:54 +02:00
Ozzie Isaacs
c1f1952b04 Updated jsonschema requirement
Testupdate
Fixed file mode of main.js
2022-05-06 17:49:12 +02:00