Commit Graph

1304 Commits

Author SHA1 Message Date
Ozzieisaacs
cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 2019-06-21 09:46:03 +02:00
Ozzieisaacs
5c7aeb2f2c Change GDrive 2019-06-20 20:12:01 +02:00
Daniel Pavel
e254565901 support binding the http server to a unix socket file instead of TCP socket 2019-06-18 08:57:37 +03:00
Heimen Stoffels
d9f69ca264
Updated Dutch translation 2019-06-17 22:38:32 +02:00
Ozzieisaacs
cd546eb6d4 Update comic reader js 2019-06-17 19:48:17 +02:00
Ozzieisaacs
f40fc5aa75 Update LDAP 2019-06-16 08:59:25 +02:00
Ozzieisaacs
9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
2019-06-16 08:20:01 +02:00
Ozzieisaacs
d45b1b8ea5 Fix #937
logviewerintegrated
Code cosmetics
2019-06-15 21:18:13 +02:00
Ozzieisaacs
e67d707867 Fix for #588
Merge remote-tracking branch 'linuxserver/master'
2019-06-15 11:58:55 +02:00
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
Solve typo
2019-06-14 22:56:21 +02:00
Krakinou
304db0d20e Solve typo 2019-06-14 22:55:17 +02:00
Ozzieisaacs
3f5c6c1fa5 Fix #937 2019-06-13 20:01:37 +02:00
Ozzieisaacs
26949970d8 Revert logging functions
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
f5e3ed26b9 Fix for #935 2019-06-10 19:31:13 +02:00
Ozzieisaacs
8e4539cf8e Prevent delete of last admin user 2019-06-10 19:26:01 +02:00
Ozzieisaacs
c81d4edb7d Fix for #923 2019-06-10 16:38:29 +02:00
Ozzieisaacs
546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
Ozzieisaacs
14b6202eec Code cosmetics
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
Ozzieisaacs
50973ffb72 Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop 2019-06-08 06:52:41 +02:00
Krakinou
9a5ab97d78
Merge branch 'master' into master 2019-06-08 01:41:43 +02:00
Krakinou
79286c9384 encode password 2019-06-08 00:54:45 +02:00
yjouanique
c4e3f3670f Added public /reconnect endpoint 2019-06-07 12:15:31 +07:00
Daniel Pavel
b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
Krakinou
97d12b94f6 Correct settings update 2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf initial flask_simpleldap implementation 2019-06-02 22:07:22 +02:00
Ozzieisaacs
f736a15c12 Fix for restart of newer versions of tornado during update
Fix for updater with Beta Versions
2019-06-02 18:47:25 +02:00
Ozzieisaacs
a02f949d23 Fix for updater with beta releases 2019-06-02 18:09:44 +02:00
Ozzieisaacs
bb0d5c5538 Working for pip and "normal" start for python3 and python2 2019-06-02 09:33:45 +02:00
Ozzieisaacs
87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 2019-05-31 16:24:13 +02:00
Ozzieisaacs
6662a58cb0 Update translationfiles 2019-05-31 15:48:19 +02:00
Ozzieisaacs
4fecce0a0d Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt
2019-05-31 11:17:47 +02:00
Ozzieisaacs
26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02:00
Ozzieisaacs
df5d15d1a2 Merge remote-tracking branch 'comicapi/master' 2019-05-30 10:43:28 +02:00
Ozzieisaacs
ecedf92783 Update version
Make custom columns visible (#904)
2019-05-30 10:21:11 +02:00
Ozzieisaacs
d106ada9ed Changed version
Update translation
2019-05-30 09:07:52 +02:00
Ozzieisaacs
ed91048a63 Fix for magic link with python 3 2019-05-26 11:31:09 +02:00
Ozzieisaacs
f70c839014 Added additional permission viewer 2019-05-19 18:39:34 +02:00
Ozzieisaacs
e6ff2f1d90 Fix file not found loading-icon.gif 2019-05-16 19:42:59 +02:00
subdiox
867aa2f0bd Beautify bitjs 2019-05-14 04:28:06 +09:00
subdiox
7982ed877c Downgrade bitjs to es5 branch 2019-05-13 14:53:25 +09:00
Ozzieisaacs
0c80f5c63a Update Teststatus 2019-05-12 19:44:52 +02:00
Ozzieisaacs
1030e195a5 Fix #916 2019-05-11 13:03:38 +02:00
subdiox
c0d136ccd8 Fix slow loading 2019-05-10 08:16:03 +09:00
Ozzieisaacs
479b4b7d82 Update translations, integrated update of Italian translation 2019-05-08 20:24:10 +02:00
Ozzieisaacs
a42ebdc096 Fix for #897 2019-05-07 19:54:13 +02:00
Ozzieisaacs
49ba221e85 Merge remote-tracking branch 'direction' 2019-05-07 18:54:27 +02:00
Ozzieisaacs
3b03aa30a6 Fix for advanced search 2019-05-06 20:51:44 +02:00
Ozzieisaacs
cb0403a924 Merge remote-tracking branch 'adv_search/master' 2019-05-06 20:48:46 +02:00
Marvin Marx
a2c7741e21 Fix "Internal Server Error" on advanced search
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
2019-05-05 17:58:45 +02:00
Ozzieisaacs
55bb8d4590 Fix #900 2019-05-01 17:47:54 +02:00
Ozzieisaacs
b80bfa5260 Improvement for #897 2019-04-29 19:01:30 +02:00
Ozzieisaacs
f941908f73 Workaround for #889 2019-04-23 21:32:48 +02:00
Ozzieisaacs
9b3b2acb49 Sort button is correctly visible on list pages
Publisher list is working
2019-04-22 19:17:23 +02:00
Ozzieisaacs
406d1c76c9 Sorting and filtering of lists working (except file formats)
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
2019-04-22 19:11:35 +02:00
subdiox
c2bfb29726 Add reading direction settings to readcbr page 2019-04-21 18:20:15 +09:00
subdiox
204de4aef6 Fix an issue that fullscreen doens't work on some browsers 2019-04-21 18:02:02 +09:00
subdiox
8b6d165d64 Fix Japanese translation 2019-04-21 17:53:40 +09:00
Ozzieisaacs
bfd0e87a17 Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/reverseproxy.py
2019-04-21 08:50:31 +02:00
Ozzieisaacs
6a7b8c7870 Update Version info
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
2019-04-21 08:48:51 +02:00
Ozzieisaacs
2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
2019-04-20 18:32:46 +02:00
Ozzieisaacs
f1a65a2aeb Clarified licences for isolanguages.py and reverseproxy.py 2019-04-20 17:57:06 +02:00
Ozzieisaacs
cc5c2c0f65 Update Version info 2019-04-20 12:30:33 +02:00
Ozzieisaacs
c748716ad2 Fix for opds feed of unread/read books 2019-04-19 12:07:46 +02:00
Ozzieisaacs
544405f5aa Update search for cyrillic letters #877 2019-04-19 06:54:12 +02:00
Ozzieisaacs
67736fe187 Catch errors on loading pickle file
Fix for cover images without Pillow
2019-04-18 21:17:59 +02:00
Ozzieisaacs
89516fc2d6 Make PIL optional #885 2019-04-17 20:45:08 +02:00
Ozzieisaacs
e1e79a73e8 Fix #884 2019-04-17 20:14:24 +02:00
Ozzieisaacs
0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 2019-04-17 19:55:32 +02:00
Ozzieisaacs
91ebe33879 Merge remote-tracking branch 'image_formats/dev' 2019-04-15 20:57:25 +02:00
Ozzieisaacs
05da2ae3c7 Update search for cyrillic letters 2019-04-14 18:20:45 +02:00
Ozzieisaacs
4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
2019-04-14 18:18:39 +02:00
Ozzieisaacs
55bdd13fb1 Fix #877 2019-04-14 17:54:18 +02:00
Ozzieisaacs
4552208c02 Fix #848 2019-04-14 16:37:57 +02:00
Ozzieisaacs
436c2671d1 Fix delete domain entries
Fix error handling smtp.authentication error
2019-04-14 14:08:49 +02:00
Ozzieisaacs
a669eacde9 Merge remote-tracking branch 'proxy/patch-1' 2019-04-14 11:19:36 +02:00
Ozzieisaacs
2253708da7 Merge remote-tracking branch 'proxy/patch-1' into Develop 2019-04-14 10:54:09 +02:00
Ozzieisaacs
51e591bd25 Added updated translation 2019-04-13 16:46:06 +02:00
Ozzieisaacs
5188c62bea Merge remote-tracking branch 'translation/loc-hu' 2019-04-13 16:45:05 +02:00
Ozzieisaacs
2a5f2ff7b3 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
2019-04-13 16:42:09 +02:00
Ozzieisaacs
e754ce313c Merge remote-tracking branch 'pycountry/pycountry' 2019-04-13 16:34:04 +02:00
Ozzieisaacs
dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
2019-04-13 15:02:01 +02:00
Barnabás Nagy
afc79416b2
HU Translation updates
Translation of the new untranslated strings
2019-04-06 23:38:59 +02:00
Josh Max
cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
2019-04-03 01:25:29 -07:00
Iris Wildthyme
cbdc9876b2 comicapi dependency now pippable 2019-04-02 20:58:23 -04:00
Iris Wildthyme
05d0f12608 redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation 2019-04-02 18:52:45 -04:00
Daniel Pavel
858c80bb20 'except' style fix 2019-03-29 17:06:26 +02:00
Daniel Pavel
f7e640fd98 support pycountry if iso-639 is not available 2019-03-29 07:00:10 +02:00
Daniel Pavel
439ce19b5d Updated epub.js to v0.3.66 2019-03-28 07:23:45 +02:00
Ozzieisaacs
1c9ff6421d Fix uploader 2019-03-26 18:23:30 +01:00
Ozzieisaacs
4b301a7961 Additional fix for #845 (in case of error) 2019-03-26 18:19:39 +01:00
Ozzieisaacs
dc93222579 Update 2 column author list view 2019-03-26 17:54:12 +01:00
Yijun Zhao
6c493df2f5 support issue: #843 2019-03-26 14:34:51 +08:00
Ozzieisaacs
772f978b45 Improved code quality 2019-03-24 16:24:43 +01:00
Ozzieisaacs
0f1db18eae Simplified typeahead 2019-03-24 16:14:42 +01:00
Ozzieisaacs
6940bb9b88 Code improvement 2019-03-24 15:58:43 +01:00
Ozzieisaacs
07649d04a3 Fix updater
Update translations
Code cleaning updater
2019-03-24 15:27:23 +01:00
Ozzieisaacs
39a3f70084 Fix for slow updater 2019-03-24 15:22:41 +01:00
Ozzieisaacs
8923e71220 Remove debug logging 2019-03-24 15:18:01 +01:00
Ozzieisaacs
843a93fe28 Updater fix for slow servers 2019-03-24 15:15:36 +01:00
OzzieIsaacs
fa36072699 Fix uk translation-file 2019-03-24 08:18:41 +01:00
OzzieIsaacs
8ab9365688 Prevent error 500 for cover of not exisiting book 2019-03-23 20:29:53 +01:00
Chad Bergeron
169ace777a Fixed infinite scroll for read and unread displays (#855) 2019-03-21 19:18:44 +01:00
Elifcan Cakmak
ec2103a3d0 fixed a bug that affects allowing password change for users (#854) 2019-03-20 13:06:11 +01:00
Ozzieisaacs
e5593d9a7f Integrated author in sorting functions 2019-03-16 21:14:01 +01:00
Ozzieisaacs
3f2a9c8bae Code improvement 2019-03-16 17:33:15 +01:00
Ozzieisaacs
7c69589c5b Code cosmetics unrar.js 2019-03-16 17:30:24 +01:00
Ozzieisaacs
149e9b4bd4 Code cosmetis unrar 2019-03-16 17:28:21 +01:00
Ozzieisaacs
a360b1759a Code cosmetics
bugfix import HttpError from pydrive
2019-03-16 17:20:14 +01:00
Ozzieisaacs
765b817384 Refactored shelf.py and editbooks.py 2019-03-16 16:53:22 +01:00
Ozzieisaacs
baf83b2f5a Refactored generating download links 2019-03-16 16:23:40 +01:00
Ozzieisaacs
9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 2019-03-16 15:48:09 +01:00
Ozzieisaacs
a66873a9e2 Added file formats view 2019-03-11 18:42:30 +01:00
Ozzieisaacs
a0a15b4598 Fix max authors shown 2019-03-10 19:26:39 +01:00
Ozzieisaacs
4a33278596 Update ratings 2019-03-10 19:22:35 +01:00
Ozzieisaacs
6d2270d931 Fixes for Oauth 2019-03-10 12:54:32 +01:00
Ozzieisaacs
1db1c2e7df Enabling LDAP working again
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
2019-03-10 11:12:44 +01:00
Ozzieisaacs
da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
2019-03-10 08:31:10 +01:00
Ozzieisaacs
76d40411dd Translation updated 2019-03-10 08:04:31 +01:00
Ozzieisaacs
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs
0b0e62fdf2 Merge remote-tracking branch 'dialog/master'
Fix for #833
2019-03-09 20:02:17 +01:00
Ozzieisaacs
6f80a63ca6 Fix for #827 2019-03-09 07:05:43 +01:00
Andrew Sullivan
3dfc2f2580 fixing issue #833 2019-03-08 20:44:45 -05:00
Ozzieisaacs
5b0a0e2139 Fix #835 2019-03-08 16:32:56 +01:00
Ozzieisaacs
9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
Ozzieisaacs
6f0b3bbda0 Fix for #812 2019-03-05 21:28:55 +01:00
Ozzieisaacs
feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
2019-03-05 20:59:30 +01:00
Ozzieisaacs
1561a4abdf Comic improvments 2019-03-05 20:19:02 +01:00
Ozzieisaacs
f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
2019-03-05 17:34:51 +01:00
Ozzieisaacs
466af21548 Code Cosmetics 2019-03-05 16:31:09 +01:00
Ozzieisaacs
0224d45961 Code cosmetics 2019-03-04 20:03:09 +01:00
Ozzieisaacs
0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +01:00
Ozzieisaacs
6269a83c3d Fix mismerge user logon with python3 in opds feed 2019-03-03 20:51:19 +01:00
Ozzieisaacs
f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
Ozzieisaacs
fb23db57b4 Added filtering of authors, series, categories, publishers 2019-03-03 15:37:53 +01:00
Ozzieisaacs
11b770b3fb Fix for #830
Fix user with umlauts
2019-03-03 08:41:50 +01:00
Ozzieisaacs
fda977b155 Fix for users with umlauts 2019-03-03 08:38:36 +01:00
Ozzieisaacs
68a36597ab Fix opds login on python3 2019-03-03 07:37:15 +01:00
Ozzieisaacs
fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
2019-03-01 21:00:09 +01:00
Ozzieisaacs
de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
2019-03-01 19:09:37 +01:00
jianyun.zhao
54a006a420 [fix] Add a scroll bar to a long list of meta information 2019-03-01 10:57:27 +08:00
Ozzieisaacs
361a1243d7 Improvements #828 2019-02-27 19:30:13 +01:00
Ozzieisaacs
246d7673a9 Corrected file header with copyright information 2019-02-27 18:20:50 +01:00
Virgil Grigoras
bd7b0175a1 Fix remaining shown by codacy 2019-02-26 17:24:13 +01:00
Virgil Grigoras
f5cf62f209 Fix issues shown by codacy 2019-02-26 11:17:06 +01:00
Virgil Grigoras
15aa49e163 shorten authors in author / discover / index / search and shelf 2019-02-25 19:27:59 +01:00
Virgil Grigoras
3272b4ca1e configuration field for max_authors 2019-02-25 19:26:43 +01:00
Virgil Grigoras
d3ed0317bb styling and javascript for hiding authors 2019-02-25 19:25:08 +01:00
Virgil Grigoras
e5bc1ae020 Add new database field for storing max_authors 2019-02-25 19:21:49 +01:00
Ozzieisaacs
eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
2019-02-24 19:34:57 +01:00
Ozzieisaacs
fad62a0909 translation update 2019-02-24 19:23:51 +01:00