Ozzieisaacs
587174b771
Fix #1272
2020-04-04 08:53:22 +02:00
Ozzieisaacs
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
2020-04-04 06:57:54 +02:00
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
Ozzieisaacs
ec6b346ca1
Update Translation
2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82
Merge remote-tracking branch 'po/master'
2020-04-03 19:27:10 +02:00
Ozzieisaacs
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
Ozzieisaacs
3ba610eb64
Revert accidentally committed changes in opds feed
2020-04-02 19:07:41 +02:00
Ozzieisaacs
2436c6a118
Merge remote-tracking branch 'caliblur/master'
2020-04-02 18:27:21 +02:00
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
Ozzieisaacs
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
BeckyDTP
734e2ffbb2
Updated Polish translations
2020-03-31 21:53:13 +02:00
hexeth
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
Michael Shavit
7cb6801241
Fix issue with cover images.
2020-03-30 02:17:08 -04:00
Ozzieisaacs
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
Ozzieisaacs
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
Ozzie Isaacs
6d1a3ccdcc
Improve logger for windows
2020-03-28 07:13:51 +01:00
Josh O'Brien
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
Ozzieisaacs
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
2020-03-14 10:45:58 +01:00
Ozzieisaacs
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f
Fix #1259
2020-03-14 10:35:58 +01:00
Ozzieisaacs
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
Unknown
a26ce8d8b5
Updated & corrected Dutch translations
...
Un-wonky-fied some literal translations, corrected contexts an respected punctuations, whitespaces, etc.....
See https://github.com/janeczku/calibre-web/issues/606#issuecomment-595913808
2020-03-13 14:01:42 +01:00
Michael Shavit
de0e27c512
Fix #1164 merge.
2020-03-12 20:09:26 -04:00
Ozzieisaacs
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
2020-03-12 20:35:24 +01:00
Ozzieisaacs
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
2020-03-12 20:32:08 +01:00
Ozzieisaacs
46b87dc7eb
Fix for testability of kobo
2020-03-09 20:25:59 +01:00
ElQuimm
fe7c56d269
italian updated version of messages.po
...
09.03.2020
2020-03-09 09:11:41 +01:00
Michael Shavit
ad564e25ca
More fixes for Kobo Sync
...
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
2020-03-08 01:20:54 -05:00
Ozzieisaacs
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +01:00
Ozzieisaacs
89927fd7e9
Merge ComicVine API
2020-03-07 13:33:35 +01:00
Ozzieisaacs
18794831e0
Chang link to issue template
2020-03-07 11:27:50 +01:00
Ozzieisaacs
3fb851304f
Merge remote-tracking branch 'ru/master'
2020-03-07 11:21:10 +01:00
Ozzieisaacs
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
2020-03-07 11:07:43 +01:00
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
ZIzA
82afa81220
up
2020-02-29 20:41:51 +04:00
ZIzA
d730eb8d31
fix
2020-02-29 20:26:52 +04:00
ZIzA
5a219b580f
ru update
2020-02-29 19:10:01 +04:00
Ozzieisaacs
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
2020-02-29 09:55:54 +01:00
Ozzie Isaacs
df7d3d18b6
pdf reader
2020-02-29 08:33:09 +01:00
Wanoo
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
Ozzieisaacs
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
2020-02-26 20:05:44 +01:00
Ozzieisaacs
4e8b814ec2
Fix download URL for IPV6
2020-02-26 20:04:15 +01:00
Ozzieisaacs
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
2020-02-26 18:03:26 +01:00
Jeff
0854303710
Update Chinese translation
2020-02-26 19:47:25 +08:00
Michael Shavit
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
2020-02-26 01:06:03 -05:00
Rewerson
6c614c06f6
restricted_tags -> denied_tags
...
Fix for the next error after update:
Traceback (most recent call last):
File "cps.py", line 34, in <module>
from cps import create_app
File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
config = config_sql.load_configuration(ub.session)
File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
update_op.exec_()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
self._do_exec()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
values = self._resolved_values
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
desc = _entity_descriptor(self.mapper, k)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
"Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
2020-02-25 16:30:51 +03:00
Ozzieisaacs
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
Ozzieisaacs
187ca5dc8f
Fix #1221
2020-02-24 19:08:54 +01:00
Ozzieisaacs
7d795771d3
Fix #1221
2020-02-24 19:02:38 +01:00
Ozzieisaacs
040bb4a5a8
Merge remote-tracking branch 'origin/master'
2020-02-23 20:07:51 +01:00
Ozzieisaacs
fc4436f091
Update Translation
2020-02-23 20:07:21 +01:00
Ozzie Isaacs
b9f3ac2eea
Windows compatability
2020-02-23 17:23:38 +01:00
Ozzieisaacs
9fc0c3b3de
Merge remote-tracking branch 'English_texts/master'
...
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
Ozzieisaacs
4f81184da0
Update translation
2020-02-23 13:22:57 +01:00
Ozzieisaacs
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
2020-02-23 13:17:59 +01:00
Ozzieisaacs
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
2020-02-23 13:14:12 +01:00
Ozzieisaacs
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
2020-02-23 12:40:11 +01:00
Ozzieisaacs
24d755b123
Update translations
...
Merge remote-tracking branch 'it/patch-7'
2020-02-23 10:55:56 +01:00
Ozzieisaacs
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
Ozzieisaacs
134a10f56c
Merge remote-tracking branch 'origin/Develop' into Develop
...
# Conflicts:
# cps/updater.py
2020-02-23 08:58:47 +01:00
Ozzieisaacs
3a70c86f49
Update updater to handle venv folders
2020-02-23 08:58:13 +01:00
OzzieIsaacs
371097eb4d
Update Updater
2020-02-23 07:54:58 +01:00
Ozzieisaacs
372c284ad4
Merge branch 'master' into Develop
2020-02-22 16:24:06 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210
2020-02-21 18:25:02 -03:00
Ozzieisaacs
b7f3e00fbf
Update updater to handle venv folders
2020-02-21 18:04:26 +01:00
Ozzieisaacs
27a18d60a7
Merge remote-tracking branch 'fix/robust_proxy' into Develop
...
# Conflicts:
# cps/kobo.py
2020-02-19 18:20:03 +01:00
Ozzieisaacs
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
2020-02-18 20:36:32 +01:00
ElQuimm
94a38a3b47
udate message.po in italian
...
Hello,
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
2020-02-17 21:03:33 +01:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Michael Shavit
df3eb40e3c
Make KoboStore proxying more robust.
...
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
2020-02-17 14:37:02 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master
2020-02-18 00:21:59 +11:00
Ozzieisaacs
29f6463ed9
Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download)
2020-02-16 19:55:05 +01:00
Ozzieisaacs
ed0bdbf31d
Fix for #1199 (missing referrer)
2020-02-16 19:39:32 +01:00
Ozzieisaacs
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
2020-02-16 19:24:28 +01:00
Ozzieisaacs
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
2020-02-16 19:19:10 +01:00
Ozzieisaacs
3f578122a3
Merge remote-tracking branch 'it/patch-6'
2020-02-16 18:56:14 +01:00
Ozzieisaacs
51a27322be
Merge remote-tracking branch 'cn/master'
2020-02-16 18:53:27 +01:00
Ozzieisaacs
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
2020-02-16 14:25:15 +01:00
André Frimberger
33cdf20cd5
Remove trailing whitespaces
2020-02-16 10:25:01 +01:00
Ozzieisaacs
317e59df4b
Bugfixes from tests
2020-02-15 16:02:31 +01:00
Ozzieisaacs
a9a6f5b97e
Renamed restrict -> deny
2020-02-15 10:21:45 +01:00
Ozzieisaacs
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
2020-02-15 09:08:39 +01:00
Kyos
509071949a
Moved style to css file
2020-02-13 21:05:24 +01:00
ElQuimm
697d857549
message.po italian
2020-02-13 11:29:26 +01:00
Ozzieisaacs
2ea45b1fdc
Removed shebang on non executable scripts
2020-02-10 18:37:47 +01:00
Ozzieisaacs
726595e117
Update for testability
2020-02-10 18:34:10 +01:00
Kyos
1666e32aaf
Fixes cover layouts in user edit page
2020-02-09 22:31:08 +01:00
Kyos
6a69bbe4b5
Fixes cover layouts in user edit page
2020-02-09 22:20:52 +01:00
André Frimberger
7a608b4fb0
fix binascii.Error with reverse proxy bearer token
...
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500. The corresponding error in the logs is: binascii.Error: Incorrect padding.
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods are checked.
2020-02-09 17:21:22 +01:00
Ozzieisaacs
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:47 +01:00
Ozzieisaacs
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:28 +01:00
Ozzieisaacs
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
2020-02-09 14:31:42 +01:00
Ozzieisaacs
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
2020-02-09 07:00:04 +01:00
Ozzie Isaacs
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
2020-02-08 14:40:13 +01:00
Ozzie Isaacs
2535bbbcf1
Fix #1180 working on windows with tornado and python <3.8 again
2020-02-08 13:24:01 +01:00
Ozzieisaacs
6698773d81
Improved testability
2020-02-08 11:33:31 +01:00
xcffl
aefaf47f4c
Update Simplified Chinese translation
2020-02-03 17:26:17 +08:00
Josh O'Brien
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
2020-02-03 14:22:00 +11:00
Ozzieisaacs
b33a2ac90d
Fix #1170 Auth-digest Header no longer crashs calibre-web
...
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
2020-02-02 07:47:27 +01:00
Ozzieisaacs
f67953c447
Update translation
...
Merge remote-tracking branch 'cz/patch-11'
2020-02-01 15:03:03 +01:00
Ozzieisaacs
981632f599
Merge remote-tracking branch 'it/patch-5'
2020-02-01 15:02:10 +01:00
Ozzieisaacs
a6c453d826
Merge remote-tracking branch 'pl/pl_translate_update'
2020-02-01 15:01:58 +01:00
Ozzieisaacs
4087e685f4
Fix auto detection of locale
2020-02-01 13:40:29 +01:00
Ozzieisaacs
5255085de1
Fix auto detection of locale
2020-02-01 13:38:11 +01:00
ElQuimm
9247ded710
Update - italian version of message.po
2020-01-29 21:41:54 +01:00
Jerzy Piątek
0bb0cbaef0
Updated polish translations
2020-01-28 22:28:58 +01:00
Lukáš Heroudek
0f7d272e13
Update messages.po
2020-01-28 10:03:40 +00:00
Ozzieisaacs
00dafe3121
Fix restrict columns
2020-01-27 20:34:36 +01:00
Ozzieisaacs
e44494aad0
Kobo sync enable/disable working
2020-01-27 20:32:37 +01:00
Ozzieisaacs
4ab3dc2599
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
2020-01-27 18:20:50 +01:00
Ozzieisaacs
acfad7a982
Update Italian translation
2020-01-27 18:17:17 +01:00
Ozzieisaacs
b29b5b7ac1
Merge remote-tracking branch 'github/fix-admin-view-log-file'
2020-01-27 18:14:16 +01:00
ElQuimm
7803ffb995
Update italian message.po
...
Thank you.
2020-01-27 15:07:00 +01:00
Ghighi Eftimie
fc79cdfaa2
fix mismerge
2020-01-27 15:24:11 +02:00
Michael Shavit
f9dbc6bc78
Clean-up book from ArchivedBook on hard-delete.
...
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
2020-01-26 16:20:10 -05:00
Michael Shavit
dc7aaae235
Now that CalibreWeb delete requests are respected, we can forward
...
them to the KoboStore for books that aren't in Calibre.
Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
2020-01-26 16:01:27 -05:00
Michael Shavit
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
Ghighi Eftimie
647e954e8a
fix admin view of error log
2020-01-26 20:53:03 +02:00
Ozzieisaacs
004d9118bc
Merge branch 'master' into Develop
2020-01-26 19:37:14 +01:00
Ozzieisaacs
594c8aad91
Update Version Info
2020-01-26 19:36:15 +01:00
Ozzieisaacs
542a0008c9
Merge remote-tracking branch 'ru/master'
2020-01-26 19:33:37 +01:00
Ozzieisaacs
24f7918aa4
Merge remote-tracking branch 'it/patch-4'
2020-01-26 19:31:52 +01:00
Ozzieisaacs
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
2020-01-26 19:29:36 +01:00
Ozzieisaacs
0411d4a8c9
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
...
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
Ozzieisaacs
a986faea56
Merge remote-tracking branch 'fix/fix_creation_time' into Develop
2020-01-26 16:50:38 +01:00
Ozzieisaacs
ad71d0a03f
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
2020-01-26 14:43:44 +01:00
Ozzieisaacs
0955c6d6fb
Update Kobo
2020-01-26 14:42:53 +01:00
Michael Shavit
d30b44ee0f
Minor formatting changes per codacy review.
2020-01-26 01:12:52 -05:00
Michael Shavit
a6f4db0f25
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:32:05 -05:00
Michael Shavit
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
2020-01-26 00:29:36 -05:00
Michael Shavit
5027aeb3a0
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:29:36 -05:00
Michael Shavit
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
Michael Shavit
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
2020-01-26 00:16:55 -05:00
Simon Latapie
69fa7d0091
new user: disable kobo token on new user page
...
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
2020-01-25 22:41:55 +01:00
ZIzA
e1d6aec682
quick fix
...
sorry
2020-01-21 23:06:22 +04:00
ZIzA
155795a18e
Russian language update
2020-01-21 22:29:23 +04:00
Ozzie Isaacs
3c63e2b7e4
Update version number
2020-01-21 07:04:18 +01:00
Simon Latapie
9b119fa724
edit book: manage identifiers
2020-01-20 22:26:43 +01:00
ElQuimm
a17c1c063e
Update messages.po
...
:-)
Thank you
2020-01-20 22:05:11 +01:00
Ozzieisaacs
6728f5da2d
Update Czech translation
2020-01-20 20:32:41 +01:00
Lukáš Heroudek
16adeae5c3
Update messages.po
2020-01-20 15:23:54 +00:00
Lukáš Heroudek
485eba94cc
Update messages.po
2020-01-20 14:41:51 +00:00
Lukáš Heroudek
5a074348ac
Update messages.po
2020-01-20 14:02:23 +00:00
Ozzieisaacs
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
Сергей
4c8f3f7bae
Add files via upload
2020-01-20 01:46:41 +04:00
Ozzie Isaacs
165cbad67b
Delete tess.py
2020-01-19 15:04:49 +01:00
Ozzieisaacs
b30da58eb9
Update german translation
2020-01-18 12:55:18 +01:00
Ozzieisaacs
b0fb6b858d
Merge remote-tracking branch 'swedish/patch-4'
2020-01-18 12:29:22 +01:00
Jony
53ce22ef5e
Update Swedish translation
...
I translated the new strings.
2020-01-18 12:18:05 +01:00
Ozzieisaacs
8e7a52f44e
Merge remote-tracking branch 'swedish/master'
2020-01-18 12:04:49 +01:00
Jony
4406220f70
Update Swedish translation
...
Update file
2020-01-18 11:25:07 +01:00
Ozzieisaacs
8f4253adbd
Fix for limiting domains (now no restriction to domain only)
2020-01-18 10:32:09 +01:00
Ozzieisaacs
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
2020-01-15 17:58:23 +01:00
Ozzieisaacs
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
2020-01-15 17:57:00 +01:00
Ozzieisaacs
ce66c752c4
Updated czech translation
...
removed language selection for guest user
2020-01-14 18:21:31 +01:00
Lukáš Heroudek
4e42a179fa
Update messages.po
2020-01-14 16:45:45 +00:00
Ozzieisaacs
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
2020-01-13 18:39:25 +01:00
Ozzieisaacs
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
2020-01-13 18:37:29 +01:00
Ozzieisaacs
1b42dd1043
Update czech and german translation
2020-01-13 18:24:47 +01:00
Lukáš Heroudek
77e0022252
Update messages.po
...
Added missing and clenup
2020-01-13 10:29:14 +00:00
Simon Latapie
56964a890b
caliBlur theme: fix custom column display that contain colons
2020-01-12 14:26:07 +01:00
Ozzieisaacs
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
2020-01-12 14:11:53 +01:00
Ozzieisaacs
79a9ef4859
Make Kobo optional
...
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
Ozzieisaacs
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2020-01-11 18:35:04 +01:00
Ozzieisaacs
8143c16c14
Added texts for allowed denied tags in configuration
...
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
2020-01-11 13:28:09 +01:00
Ozzieisaacs
42435ab34a
Improved testablility
2020-01-08 19:52:05 +01:00
Lukáš Heroudek
434fb2e7cb
Add files via upload
2020-01-08 12:06:13 +00:00
Lukáš Heroudek
bce70bf17c
Update messages.po
2020-01-08 12:05:36 +00:00
Lukáš Heroudek
cde44178c4
Create messages.po
2020-01-08 12:03:52 +00:00
Ozzieisaacs
661ed17d23
Handle stream output in logviewer
...
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
2020-01-07 20:26:59 +01:00
Ozzieisaacs
c659f28334
Fix #1128
2020-01-06 11:52:59 +01:00
Ozzieisaacs
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
Ozzieisaacs
24ae7350f5
Fix # #1127 (user template show random books in detail view not saved)
2020-01-05 16:18:51 +01:00
Ozzieisaacs
c60277f4d3
Capitalize language selection in User settings
...
Remove sql statement from log.debug statement upon creation of new column in settings database
2020-01-05 14:07:26 +01:00
Ozzieisaacs
6a07cfba65
Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
...
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
2020-01-05 13:38:51 +01:00
Ozzieisaacs
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
2020-01-05 08:47:03 +01:00
Ozzieisaacs
56ee8c56ba
Fix #1122
...
(Uploading books with applied language restriction leads no longer to error 500)
2020-01-05 08:40:57 +01:00
Ozzieisaacs
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
2020-01-04 07:57:54 +01:00
Ozzieisaacs
8ad84a7ceb
Fix for #1123 (mature content is visible in shelfs)
2020-01-02 17:11:30 +01:00
Ozzieisaacs
32e818af6a
Fix #1124
2020-01-02 16:09:06 +01:00
Ozzieisaacs
d9adb4fc94
Improvements for limit tags
2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
...
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c630eb604
fixes from tests
2019-12-30 15:16:09 +01:00
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
2019-12-30 15:15:07 +01:00
Ozzieisaacs
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
2019-12-29 13:54:52 +01:00
ground7
b782489a8c
ldap opds download bugged
2019-12-28 21:52:26 -07:00
Ozzieisaacs
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
ground7
6555d5869f
attempt regular login if ldap login fails as fallback
2019-12-27 23:45:42 -07:00
ground7
54c4f40188
added LDAP import
...
update defaults
2019-12-27 23:12:18 -07:00
Ozzieisaacs
62e8bee2a8
Fix response opds with read/unread
...
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2019-12-24 13:02:53 +01:00
Michael Shavit
9ec3ddd492
Fix the HandleCoverImage endpoint so that it requires login, and doesn't
...
take unused parameters.
2019-12-22 16:59:00 -05:00
Michael Shavit
d81dbb13e4
Support Epub downloads
2019-12-22 16:59:00 -05:00
Michael Shavit
c238367b64
Reload database on every call to v1/library/sync. This fixes an issue where side-loaded books appear in the sync response with no download urls.
2019-12-22 16:59:00 -05:00
Michael Shavit
cdcb8a50d1
Fix /reconnect endpoint, which was broken by 006e596c72
2019-12-22 16:58:55 -05:00
Michael Shavit
520c695401
Fix /reconnect endpoint, which was broken by 006e596c72
2019-12-22 16:54:16 -05:00
Michael Shavit
b831b9d6b2
Integrate with the official Kobo store endpoint so that no
...
functionanility is lost by overriding the api_endpoint setting.
Requests are either:
* Redirected to the Kobo Store
* Proxied to the Kobo Store
* Proxied to the Kobo Store and merged with results from CalibreWeb.
2019-12-22 13:40:49 -05:00
Ozzieisaacs
bbe91f439a
Merge from master
2019-12-22 15:28:43 +01:00
Ozzieisaacs
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
2019-12-22 15:24:22 +01:00
Ozzieisaacs
288944db2c
Merge remote-tracking branch 'kobo_sync/kobo' into Develop
...
# Conflicts:
# cps.py
# cps/kobo.py
# cps/kobo_auth.py
# cps/ub.py
2019-12-20 19:24:31 +01:00
Ozzieisaacs
f2c07d8f81
Update Kobo sync
2019-12-20 19:17:08 +01:00
Michael Shavit
d6a9746824
Add a filter to the Sync request endpoint to ignore books that don't
...
have any formats supported by the device.
2019-12-20 01:28:53 -05:00
Michael Shavit
f84274f1c5
git add missing generate_kobo_auth_url.html
2019-12-20 01:08:15 -05:00
Michael Shavit
2118d920f5
Formatter.
2019-12-20 01:04:12 -05:00
Michael Shavit
207004beff
Remove config_server_url setting.
2019-12-20 01:02:49 -05:00
Michael Shavit
27d084ce39
Remove the KoboUserKey-based Authentication.
...
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token .
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).
Also use Flask.url_for to generate download urls.
2019-12-20 00:55:53 -05:00
Ozzieisaacs
f705889c23
Inital Kobo
2019-12-17 20:28:20 +01:00
Ozzieisaacs
7098d08888
Added option to convert AZW3 to mobi for sending to kindle
2019-12-15 18:44:02 +01:00
Ozzieisaacs
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
2019-12-15 17:08:17 +01:00
Ozzieisaacs
b6d7207ec3
Added platform information for better debugging
2019-12-15 13:33:38 +01:00
Ozzieisaacs
c33623efee
Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045 )
...
Added file formats and languages to opds feed
2019-12-15 13:32:34 +01:00
Ozzieisaacs
2215bf3d7f
Implemented #1083 (Advanced search for extensions)
2019-12-15 11:35:07 +01:00
Ozzieisaacs
86fe970651
More fixes for googledrive
2019-12-14 22:22:27 +01:00
Andrew Roberts
3dc372c573
fixed typo
2019-12-12 21:38:45 -05:00
Andrew Roberts
efcee0a7b7
added reverse proxy configuration form and handler
2019-12-12 21:31:21 -05:00
Andrew Roberts
39b6b100f9
whitespace
2019-12-12 21:31:19 -05:00
Andrew Roberts
9351ff032f
whitespace
2019-12-12 21:31:17 -05:00
Andrew Roberts
f0760c07d8
added admin display of reverse proxy settings
2019-12-12 21:31:12 -05:00
Andrew Roberts
77b0954c70
use a macro for the display of boolean settings
2019-12-12 21:28:50 -05:00
Andrew Roberts
af7dbbf1e4
added logic for reverse proxy login
2019-12-12 21:27:40 -05:00
Andrew Roberts
b661c2fa92
added config fields to settings table
2019-12-12 21:27:38 -05:00
Ozzieisaacs
e308a74dc2
Fix ( #1103 ) Internal server error with Goodreads and no result for author name on Goodreads
2019-12-12 20:08:16 +01:00
Michael Shavit
040d7d9ae3
Remove unused import and fix python3 compatibility, as per Ozielsaacs comments.
2019-12-11 00:12:35 -05:00
Michael Shavit
f9b1e84704
Remove backblaze leftovers
2019-12-10 23:57:53 -05:00
Ozzieisaacs
eede894e72
Merge remote-tracking branch 'merge-metadata'
2019-12-09 20:53:16 +01:00
Michael Shavit
55c0bb6d34
Set the "Size" attribute for Kobo download_urls, and refactor the code
...
to eventually allow formats other than KEPUB.
2019-12-08 17:28:25 -05:00
Michael Shavit
2b55b9b250
Use the login_user Cookie to authorize download requests instead of
...
passing the UserKey over url params.
2019-12-08 15:33:57 -05:00
Ozzieisaacs
22add37b64
Merge remote-tracking branch 'fix typo in config_edit.html #1097 '
...
Updated translations
2019-12-08 10:10:32 +01:00
Ozzieisaacs
8a9695d48e
Fix getting metadata from douban ( #858 )
2019-12-08 09:52:57 +01:00
Ozzieisaacs
e0faad1e59
Handle no write permission to tmp folder ( #1060 )
2019-12-08 09:40:54 +01:00
Michael Shavit
fffa2d5a1b
Support passing the Auth token as a url param.
...
This is required to support ebook downloads which the Kobo device emits
without any auth headers.
* Also some other small bug fixes discovered during device testing.
2019-12-07 22:55:07 -05:00
Michael Shavit
0926ae530c
Remove custom_column usages from an earlier commit.
2019-12-07 21:08:53 -05:00
Michael Shavit
0b709f7dfb
Merge branch 'master' into kobo
2019-12-07 20:04:54 -05:00
Michael Shavit
b5da2c4199
Clean-up: Fix import order in kobo.py, and other minor formatting
...
changes.
2019-12-07 19:54:49 -05:00
Michael Shavit
9ede01f130
* Add a UserKeyToken to the User table for Kobo authorization.
...
* Add proper authorization checks on the new Kobo endpoints.
Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
2019-12-07 19:54:44 -05:00
Christian Keil
c61463447f
Merge metadata of uploaded book versions.
2019-12-06 15:00:01 +01:00
Michael Shavit
55b54de6a0
Add simple get_download_url implementation to replace the backblaze-backed implementation
2019-12-05 19:06:39 -05:00
Michael Shavit
5357867103
Add initial support for Kobo device Sync endpoint.
...
- Supports /v1/library/sync call to get list of books
- Supports /v1/library/metadata call to get metadata for a given book
+ Assumes books are stored on Backblaze for metadata call
- Changes to helper.py so that we can return no cover instead of a blank
image.
2019-12-05 01:56:59 -05:00
zhiyue
222797e631
support douban book search using apikey
2019-12-04 11:59:06 +08:00
dalin
92841b46d7
update Simplified Chinese translations.
2019-12-03 16:32:03 +08:00
dalin
4c2323fcc9
fix typo in config_edit.html
2019-12-03 16:06:25 +08:00
Ozzieisaacs
fda0ab1e86
FIx for ( #1092 listening to mp3 not working)
2019-12-01 12:36:55 +01:00
Ozzieisaacs
54079b36ae
Fix #1095 (epub viewer not working if only viewer rule wa sapplied)
2019-12-01 12:21:21 +01:00
Ozzieisaacs
f8a99c60d8
Fix for #1096 (exception on digest request)
2019-12-01 09:33:11 +01:00
Ozzieisaacs
8af178c19c
Fix for gdrive not working #1081
2019-11-26 10:46:06 +01:00
Ozzieisaacs
78f9ee86b1
Fix pdf cover
...
Fix massadding books
Add feature inform of duplicate books
2019-11-26 08:19:03 +01:00
Ozzieisaacs
ab5873984e
Merge remote-tracking branch 'translation/patch-3'
2019-11-17 06:59:22 +01:00
Ozzieisaacs
62ea8b8913
Logging to stdout, proposal form #1078
2019-11-16 10:09:34 +01:00
Ozzieisaacs
a4416c202d
Merge remote-tracking branch 'rename/develop'
2019-11-16 08:01:18 +01:00
Jony
1f5edffccf
Fix typo and update translation
2019-11-16 07:49:07 +01:00
Ozzieisaacs
651260022c
Merge remote-tracking branch 'search_title/hotfix-searchform-title'
2019-11-16 07:29:00 +01:00
Ozzieisaacs
2e4344f7ea
Merge remote-tracking branch 'swedish/master'
2019-11-16 07:27:08 +01:00
Jony
3cb7e77b60
Update messages.po
2019-11-14 18:52:06 +01:00
Ghighi Eftimie
f782dc1857
fix for search title
2019-11-14 12:08:19 +02:00
Ozzieisaacs
88f31ddad1
Fix for #1034
2019-11-07 21:04:03 +01:00
Ozzieisaacs
a7ab7fcf06
Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page
2019-11-03 09:49:54 +01:00
Ozzieisaacs
6f61e80c97
Fix #1074 , #1071
2019-10-31 15:46:38 +01:00
Ozzieisaacs
d1afdb4aac
Fix #1074 , #1071
2019-10-31 15:44:36 +01:00
Ozzieisaacs
5167ee520e
Solve cropped image pdf import ( #1068 )
2019-10-22 19:11:40 +02:00
Ozzieisaacs
f758a1cc64
Solve inverted image pdf import ( #1068 )
2019-10-21 19:33:09 +02:00
Ozzieisaacs
2145be6db2
Improvement for #1062
2019-10-20 16:47:15 +02:00
Ozzieisaacs
c740fe9124
Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order'
2019-10-20 15:50:52 +02:00
Ozzieisaacs
a371e40c66
Merge remote-tracking branch 'github_3/hotfix/epub-import'
...
Improved cover extraction from epub files
2019-10-20 15:48:06 +02:00
Ozzieisaacs
ccc6184342
Merge remote-tracking branch 'github_1/patch-1'
2019-10-20 15:03:37 +02:00
Ozzieisaacs
c8c2d6659c
Merge remote-tracking branch 'public_reconnect/master'
2019-10-20 15:03:02 +02:00
Jan Guzej
c7d7a7597c
remove language from array metadata
2019-10-19 21:49:18 +02:00
Jan Guzej
fbb7663a2f
epub metadata import fix
2019-10-19 14:04:15 -04:00
Kyos
c93dd32179
Fixed typo and column size for LG screens
2019-10-19 12:02:14 +02:00
Kyos
7165826011
Adds Authors, Series and Book Cover to the shelf order view
2019-10-19 10:57:48 +02:00
Kyos
ada727a570
Adds Authors, Series and Book Cover to the shelf order view
2019-10-19 10:52:03 +02:00
gwenhael
01b0f9534c
fix issue #1064
...
Allow for finer steps in serie-index
2019-10-18 15:12:27 +02:00
zelazna
3764c33a3a
Add the posibility to change the username
2019-10-01 15:36:00 +02:00
Ozzieisaacs
9fc02f67c2
Debug output for lcase
2019-09-27 15:30:39 +02:00
Ozzieisaacs
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
2019-09-27 08:15:10 +02:00
Ozzieisaacs
e31df16309
Revert bug in updater.py preventing new files from being created
2019-09-24 19:00:47 +02:00
Ozzieisaacs
d7ea5bb9d7
Fix for #1037
...
Update German translation
2019-09-17 18:25:17 +02:00
Ozzieisaacs
6cda5fee0d
Fix language selection on python3
2019-09-06 20:56:17 +02:00
Ozzieisaacs
ca5e285c5a
Merge branch 'Develop'
2019-09-06 19:05:02 +02:00
Ozzieisaacs
fb0eebfc52
Merge remote-tracking branch 'spanish/master'
2019-09-06 19:03:03 +02:00
Ozzieisaacs
dd90fb003e
Merge remote-tracking branch 'french/master'
2019-09-06 19:01:45 +02:00
Ozzieisaacs
61cd044255
Merge remote-tracking branch 'polish/master'
2019-09-06 19:01:17 +02:00
Ozzieisaacs
879d02081a
Fix #1021
2019-09-06 18:57:41 +02:00
Ozzieisaacs
051bc53aa2
Fix for #1009
2019-09-02 19:27:34 +02:00
Angel Docampo
5515772903
updated spanish translations
2019-08-27 13:16:23 +02:00
Angel Docampo
ff900fd9c0
updated spanish translations
2019-08-27 13:15:18 +02:00
Yamakuni
eec4be7a29
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-25 01:01:05 +01:00
Yamakuni
1385ecb383
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:21 +01:00
Yamakuni
74418f3139
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:13 +01:00
Yamakuni
72def4b97b
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:04 +01:00
Yamakuni
564c3b4778
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:47 +01:00
Yamakuni
c9eff4a70c
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:38 +01:00
Yamakuni
879f63d1c1
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:01 +01:00
Yamakuni
3fb458dd19
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:00:52 +01:00
Yamakuni
d9a73b4fa3
French translation
...
Add and modify some little things
2019-08-21 15:21:17 +01:00
Ozzieisaacs
23b3bfd967
Additional fix #1016
2019-08-20 19:12:40 +02:00
Ozzieisaacs
f543d7f486
Fix #1016
2019-08-20 18:32:04 +02:00
Radosław Kierznowski
6a058d2c52
Update polish translation
2019-08-18 22:08:08 +02:00
Vincent Kriek
38a255e069
Add automatic epub to kepub conversion using kepubify
2019-08-18 21:44:19 +02:00
Ozzieisaacs
ff41775dbb
Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop
2019-08-17 17:27:06 +02:00
Ozzieisaacs
d04a78afe6
Merge remote-tracking branch 'public_shelf/Develop' into Develop
2019-08-17 16:03:29 +02:00
Ozzieisaacs
f566237be0
Merge remote-tracking branch 'bootstrap/Develop' into Develop
2019-08-17 15:59:13 +02:00
Dmitriy Istomin
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
2019-08-16 11:18:39 -04:00
W1ndst0rm
4cbdccd39e
Fix for https://github.com/janeczku/calibre-web/issues/1002
2019-08-13 23:07:15 -06:00
Ozzieisaacs
9356148e2d
Added more information about dependencies
2019-08-06 19:53:33 +02:00
Ozzieisaacs
4be55285d8
Fix #1001
2019-08-06 18:38:17 +02:00
Ozzieisaacs
3eae2e9c2c
Changed text for not found imports
2019-08-03 18:24:56 +02:00
Ozzieisaacs
e9fb5d9f25
Bugfix for comicapi
2019-08-03 14:09:54 +02:00
Ozzieisaacs
6261981656
Fix for #991
...
Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion
2019-08-03 12:56:32 +02:00
Ozzieisaacs
82ca3f31f9
Merge remote-tracking branch 'pwr/master'
2019-07-31 17:40:50 +02:00
Ozzieisaacs
97f3aa8325
Update dutch language
2019-07-31 17:38:28 +02:00
Daniel Pavel
7c503b4a31
provide a default logging configuration ( fixes #987 )
2019-07-31 09:42:10 +03:00
Daniel Pavel
9f8cab99e3
Moved language names from iso639.pickle to a python file
2019-07-30 15:16:24 +03:00
Ozzieisaacs
5f25b81004
Final fix for #983
2019-07-29 21:43:00 +02:00
Ozzieisaacs
73bbffccaa
Fix for login issue on MacOS
2019-07-28 21:29:54 +02:00
Ozzieisaacs
f59d9d5aa8
Merge remote-tracking branch 'polish/master'
2019-07-27 07:19:30 +02:00
Radosław Kierznowski
746b7b1262
Update polish translation
2019-07-26 23:04:04 +02:00
Ozzieisaacs
5f228fbb40
Update german translation
2019-07-26 17:20:48 +02:00
Ozzieisaacs
12576393cf
Merge remote-tracking branch 'spanish/patch-1'
...
Merge remote-tracking branch 'german/master'
2019-07-26 16:41:52 +02:00
Mainak
7f43a2e104
Update messages.po
...
update and revision of the Spanish translation file.
2019-07-26 11:45:45 +02:00
Ozzieisaacs
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
2019-07-25 21:42:46 +02:00
Ozzieisaacs
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
2019-07-24 18:43:23 +02:00
Ozzieisaacs
fc4dc36c65
Fix #969 (duplicate code "init" in epub reader)
...
Fix for #890
2019-07-23 19:26:01 +02:00
Ozzieisaacs
97a0dccdec
Fix for display of format, series, category, ratings,
...
Fix for display of language (sorting not working yet)
2019-07-22 21:38:52 +02:00
Ozzieisaacs
9f64a96502
Fix for #890
2019-07-22 18:28:45 +02:00
Ozzieisaacs
b9c3a3fcea
Fix #652
2019-07-21 18:19:07 +02:00
Ozzieisaacs
6d43e0422a
Fix for non found flask_login version ( #968 )
2019-07-21 17:45:21 +02:00
Ozzieisaacs
0d7e58ce79
Fix for #968 (database conversion fails for default strings under python2.7)
2019-07-21 16:23:31 +02:00
Ozzieisaacs
3e008ef29b
Fix update dates shown in local time format again
...
Fix "to update" history is shown again
2019-07-21 13:28:55 +02:00
Ozzieisaacs
5c6be5d6d0
Fix for python 3 and existing unrar entry in db
...
deleted unnecessary lines in config html template
2019-07-21 12:58:48 +02:00
Ozzieisaacs
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
Ozzieisaacs
c6542fdec6
New Oauth code
2019-07-20 20:01:05 +02:00
Ozzieisaacs
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
2019-07-17 19:07:05 +02:00
Ozzieisaacs
d168e3bfdb
Add licence to oauth
...
fix comicapi dependency
2019-07-16 21:08:37 +02:00
Daniel Pavel
99c6247baf
use the standard socket library to validate the ip address argument
2019-07-14 22:06:40 +03:00
Daniel Pavel
a334ef28e7
about page: build the versions dictionary only once
2019-07-14 21:15:46 +03:00
Daniel Pavel
63634961d4
cleaner worker api
...
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
Ozzieisaacs
d82289e303
Deactivate ldap
...
Fix setup for pypi
2019-07-14 18:37:44 +02:00
Daniel Pavel
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
2019-07-14 14:44:48 +03:00
Ozzieisaacs
8bfcdffeb6
Fix feature support
2019-07-14 13:20:40 +02:00
Ozzieisaacs
e411c0fded
Fix logging in debug mode
2019-07-14 09:18:37 +02:00
Ozzieisaacs
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
2019-07-13 20:54:21 +02:00
Ozzieisaacs
792367e35e
Version update
2019-07-13 20:27:32 +02:00
Ozzieisaacs
be64961de5
Code cosmetics comic reader
2019-07-13 19:55:51 +02:00
Ozzieisaacs
405a3909b0
Fix for opds with LDAP authentication
2019-07-13 17:51:25 +02:00
Ozzieisaacs
b1cb7123a3
Fix for #959
2019-07-11 20:37:03 +02:00
Ozzieisaacs
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
Ozzieisaacs
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
2019-07-06 14:46:25 +02:00
Ozzieisaacs
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
2019-07-06 14:35:12 +02:00
Ozzieisaacs
ad44e58c7a
Sorting for comics
...
Audiobook support
2019-06-29 14:23:39 +02:00
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
2019-06-23 21:11:45 +02:00
Ozzieisaacs
32af660f86
Improvements for logfile viewer
...
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
2019-06-22 19:55:59 +02:00
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
tomjmul
8e8486497f
Restirct a user to a set of tags
2019-03-19 13:53:41 +00: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
Ozzieisaacs
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
2019-02-24 19:23:51 +01:00
Ozzieisaacs
1de3929988
Unicode
2019-02-24 19:08:24 +01:00
Ozzieisaacs
cc3088c52f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
2019-02-24 10:39:37 +01:00
Ozzieisaacs
0facb8fffa
Fix #766
2019-02-23 18:28:25 +01:00
Ozzieisaacs
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
2019-02-23 14:26:02 +01:00
AngelByDay
38307ececb
Force namespace resolution of imports
...
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
2019-02-22 12:24:51 -05:00
Ozzieisaacs
17b7333992
Merge remote-tracking branch 'caliblur/master'
2019-02-20 20:00:08 +01:00
leram84
ae279c5123
fixed description read-more button
2019-02-20 12:57:38 -05:00
Ozzieisaacs
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
2019-02-20 18:09:42 +01:00
Ozzieisaacs
ae7c4908f9
Fix #767
2019-02-20 18:04:55 +01:00
Ozzieisaacs
ea1a882353
Merge remote-tracking branch 'origin/master'
2019-02-20 18:04:40 +01:00
hexeth
9a0e8fefb7
re-add loader code
2019-02-19 13:56:49 -08:00
Matt
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
2019-02-19 13:47:53 -08:00
hexeth
5a863541de
Fix object object
2019-02-19 13:44:40 -08:00
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
2019-02-19 19:32:00 +01:00
Ozzieisaacs
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
2019-02-18 20:52:58 +01:00
Fabian Wüthrich
7fb9bf8889
Truncate single quote in upload file name
2019-02-18 13:35:30 +01:00
Ozzieisaacs
3d5d95904a
Oauth working somehow (?)
2019-02-17 19:10:16 +01:00
Ozzieisaacs
a0be02e687
Ldap working
2019-02-17 09:09:20 +01:00
Ozzieisaacs
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
2019-02-16 10:18:32 +01:00
Ozzieisaacs
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
2019-02-16 10:17:46 +01:00
Ozzieisaacs
56826f67fc
progressbar during upload thanks to jim3ma
2019-02-16 10:05:51 +01:00
Ozzieisaacs
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
2019-02-16 08:03:42 +01:00
Ozzieisaacs
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
2019-02-16 07:23:36 +01:00
lorek123
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
2019-02-10 18:17:33 +01:00
Ozzieisaacs
c1ef1bcd19
User and admin pages are working again
2019-02-09 21:26:17 +01:00
Ozzieisaacs
1fc4bc5204
Fix routes
...
Fix error page
2019-02-09 19:01:57 +01:00
Ozzieisaacs
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
Ozzieisaacs
d58d792f56
Catch Imagemagick policy error
2019-02-09 12:58:43 +01:00
Ozzieisaacs
d6ee8f75e9
More refactoring
2019-02-08 20:12:16 +01:00
Ozzieisaacs
a00d93a2d9
Working again (basically)
2019-02-06 21:52:32 +01:00
Ozzieisaacs
561d40f8ff
Merge branch 'master' into Develop
2019-02-03 20:30:37 +01:00
Ozzieisaacs
6fc4b318e8
cover folders beautified
2019-02-03 20:29:16 +01:00
Ozzieisaacs
36229076f7
Refactor subprocess calls
2019-02-03 18:32:27 +01:00
Ozzieisaacs
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
2019-02-03 17:33:54 +01:00
Ozzieisaacs
ea98323c06
Fixes Google Drive
...
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs
b75b91606c
Fix config oauth-UI
2019-01-27 11:32:16 +01:00
Ozzieisaacs
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
2019-01-27 11:22:22 +01:00
Ozzieisaacs
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
2019-01-27 11:18:08 +01:00
Ozzieisaacs
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
2019-01-27 11:16:11 +01:00
Ozzieisaacs
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
2019-01-26 19:06:54 +01:00
Ozzieisaacs
9128615f48
Fix #424
...
Fix #425
2019-01-26 09:43:17 +01:00
Ozzieisaacs
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
2019-01-25 21:58:19 +01:00
Ozzieisaacs
97064db2a4
Restart python3 fix, stop and restart python2 working again
2019-01-23 18:14:45 +01:00
Ozzieisaacs
341dd77b9d
Bugfix Restart and Stop server on python3
2019-01-21 21:01:16 +01:00
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
bacb6fb561
New updater with default setting -> only stable releases #653
2019-01-20 17:46:26 +01:00
Ozzieisaacs
62574939b2
Fix #770
2019-01-19 16:48:04 +01:00
Matt
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49b
, reversing
changes made to ae55dd6c27
.
2019-01-18 14:31:41 -08:00
hexeth
3ba9e4d96e
reader theme
2019-01-18 14:28:11 -08:00
leram84
ae55dd6c27
Update caliBlur.min.css
2019-01-18 14:17:17 -08:00
Matt
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
.
2019-01-18 14:11:39 -08:00
Matt
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
.
2019-01-18 14:11:31 -08:00
Matt
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
.
2019-01-18 14:11:24 -08:00
Matt
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
.
2019-01-18 14:11:17 -08:00
hexeth
6a2ebba85b
Not ready for commit
2019-01-18 14:06:39 -08:00
hexeth
7e9d6a3cf9
Add Dark-Reader
2019-01-18 13:50:21 -08:00
leram84
a69e43922a
Create dark-reader.css
2019-01-18 16:43:36 -05:00
leram84
df8806e182
Update caliBlur.min.css
2019-01-18 14:43:04 -05:00
hexeth
83a905bfe1
Don't remove the dropdown toggle
2019-01-18 11:35:13 -08:00
Matt
e01872fc79
Revert "Update caliBlur.min.css"
...
This reverts commit 2b7b55846b
.
2019-01-18 11:27:19 -08:00
leram84
2b7b55846b
Update caliBlur.min.css
2019-01-18 14:22:48 -05:00
hexeth
c0792b7225
Add .sendtokindle-drop to click-off
2019-01-18 11:10:54 -08:00
Matt
8825352af6
Revert "Add sendtokindle-drop to click-off array"
...
This reverts commit d83ba315f0
.
2019-01-18 11:09:26 -08:00
hexeth
d83ba315f0
Add sendtokindle-drop to click-off array
2019-01-18 11:07:50 -08:00
hexeth
16e23cb1fe
Fix upload tooltip not appearing
2019-01-18 11:04:28 -08:00
leram84
df2b1ba09d
fix for send button dropdown
2019-01-18 14:01:51 -05:00
hexeth
9a12e60b1c
Toggle for dropdown
2019-01-18 11:00:55 -08:00
hexeth
c620453ebf
UL positioning
2019-01-18 10:57:42 -08:00
hexeth
4988e3b631
add tooltip and move UL higher in DOM
2019-01-18 10:50:29 -08:00
Matt
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
.
2019-01-18 10:43:26 -08:00
Ozzie Isaacs
9e5fa45df7
Removed unnecessary wait message
2019-01-16 17:50:51 +01:00
leram84
d5ff3b6a0b
smtp setup page ( #774 )
...
fix for https://github.com/janeczku/calibre-web/issues/773
2019-01-15 21:20:03 +01:00
Ozzie Isaacs
cc618ecee7
Fix Limiting domains (related to #773 )
2019-01-15 20:08:47 +01:00
Ozzieisaacs
f4977c3767
Merge remote-tracking branch 'theme/master'
2019-01-15 18:22:09 +01:00
hexeth
a9277da85a
Update ID of button from sendbtn2 to sendbtn
...
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
2019-01-14 11:43:29 -08:00
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Krakinou
d48cdcc789
Correct authentication in case LDAP not activated
2019-01-13 11:21:11 +01:00
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
2019-01-13 11:04:32 +01:00
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
Krakinou
aafb267787
Merge branch 'master' into master
2019-01-12 23:46:59 +01:00
Krakinou
2e37c14d94
Clean some comment
2019-01-12 18:40:32 +01:00
Krakinou
91f0908059
insert into db
...
connect via LDAP config
2019-01-12 18:07:03 +01:00
Krakinou
8d284b151d
Edit html config
2019-01-12 12:52:27 +01:00
Ozzieisaacs
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
2019-01-12 09:01:08 +01:00
hexeth
4ace3a5e27
test
2019-01-11 14:13:09 -08:00
leram84
db83fb3bd7
minified
2019-01-11 16:49:45 -05:00
hexeth
883633a045
Remove beta from caliBlur selection
2019-01-11 13:46:19 -08:00
Matt
84fdf9143b
Revert "Update web.py"
...
This reverts commit a388f03b99
.
2019-01-11 13:44:17 -08:00
Matt
7a069ad72e
Revert "Update web.py"
...
This reverts commit 1bcc0698d5
.
2019-01-11 13:43:48 -08:00
leram84
f897491070
Update caliBlur.min.css
2019-01-11 16:30:01 -05:00
Ozzieisaacs
f053508013
Fix #764
2019-01-11 22:24:48 +01:00
hexeth
2ab10bb070
Update caliBlur.js
2019-01-11 13:23:12 -08:00
hexeth
1bcc0698d5
Update web.py
2019-01-11 13:21:51 -08:00
hexeth
a388f03b99
Update web.py
2019-01-11 13:20:16 -08:00
hexeth
9c75eb7016
Update caliBlur.js
2019-01-11 13:07:18 -08:00
hexeth
6c37aafae9
Update caliBlur.js
2019-01-11 13:05:22 -08:00
hexeth
550262e651
Further fix
2019-01-11 12:44:29 -08:00
hexeth
edb4cedc65
Update about page to target new body class
2019-01-11 12:43:00 -08:00
hexeth
40e45c7272
Add files via upload
2019-01-11 11:23:49 -08:00
hexeth
7032f311d5
Update caliBlur.js
2019-01-11 10:54:21 -08:00
Ozzieisaacs
66fcd71685
Merge remote-tracking branch 'origin/master'
2019-01-11 08:36:51 +01:00
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
2019-01-11 08:36:28 +01:00
Krakinou
30954cc27f
Initial LDAP support
2019-01-10 23:51:01 +01:00
hexeth
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
2019-01-10 18:26:34 +01:00
Ozzieisaacs
d5a913e195
Merge remote-tracking branch 'origin/master'
2019-01-10 11:03:48 +01:00
leram84
dba5680121
1.0 for the merge ( #758 )
...
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
2019-01-10 09:25:18 +01:00
Ozzieisaacs
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
2019-01-09 13:03:55 +01:00
hexeth
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
2019-01-08 21:58:57 +01:00
hexeth
418e98d1f8
update .published-date to .publishing-date ( #756 )
2019-01-08 18:06:29 +01:00
Ozzieisaacs
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +01:00
Ozzieisaacs
fa3426aa08
Merge remote-tracking branch 'origin/master'
2019-01-08 07:10:36 +01:00
hexeth
eb1c87fbae
Patch 4 ( #752 )
...
* Target new class
Target new class for caliblur language support
* Move publishing date into div
Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.
* Target newly created div
2019-01-08 07:10:10 +01:00
hexeth
c77825371d
Add classes to shelves for easier css selection ( #751 )
...
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
2019-01-07 21:13:51 +01:00
Ozzieisaacs
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
2019-01-06 15:00:34 +01:00
Ozzieisaacs
8db2b62b39
Merge remote-tracking branch 'origin/master'
2019-01-06 14:17:09 +01:00
Ozzieisaacs
98134616b6
Fix #661 (authors are shown according to the authors sort order)
2019-01-06 14:16:52 +01:00
Ozzieisaacs
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
2019-01-05 21:44:29 +01:00
hexeth
29c9d55498
Remove leading space in span ( #749 )
...
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
2019-01-04 21:49:01 +01:00
hexeth
ece11de942
Fix publisher not formatting correct ( #747 )
2019-01-04 20:39:11 +01:00
Ozzieisaacs
f821580b50
#Fix 745
2019-01-03 22:01:52 +01:00
Ozzieisaacs
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
2019-01-03 20:52:46 +01:00
Ozzieisaacs
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
2019-01-03 20:47:46 +01:00
Adrian Petrescu
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
2019-01-03 11:45:15 -05:00
Ozzieisaacs
9cfe1dce20
Fix #739
2018-12-30 14:25:03 +01:00
Ozzieisaacs
cb0f3cd074
Fix #696
2018-12-29 11:16:36 +01:00
Ozzieisaacs
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
2018-12-27 10:53:19 +01:00
grunjol
462cf20a34
Process all custom columns on editing
2018-12-24 13:05:47 -03:00
grunjol
00ba231fbf
fix adding an existing language to a book
2018-12-24 12:32:22 -03:00
Ozzieisaacs
677264950d
Merge remote-tracking branch 'ru-translation/master'
2018-12-16 16:59:22 +01:00
Anton Konyshev
e6b1c8cf36
Updated Russian translation
2018-12-14 16:27:19 +03:00
Ozzieisaacs
9057a3a0d7
Merge remote-tracking branch 'dutchtranslation/master'
2018-12-10 19:37:03 +01:00
Ed Driesen
45d97d277a
Update Dutch translation
...
Some lines where still untranslated, fixed it.
2018-12-09 15:11:31 +01:00
Ozzieisaacs
81e3afbcc4
Fix #714 (advanced search for ratings)
2018-12-02 12:48:12 +01:00
Ozzieisaacs
7526b0dcb4
Fix #623 , #715
2018-11-28 18:28:55 +01:00
Ozzieisaacs
64b1b830d6
Fix #712
2018-11-25 13:29:58 +01:00
Ozzieisaacs
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs
b78130e3b1
Merge remote-tracking branch '681/681-fix'
2018-11-25 07:19:00 +01:00
Ozzieisaacs
47424e5c1a
Merge remote-tracking branch 'swedish/master'
...
Improved server stop command
2018-11-24 20:47:11 +01:00
Jony
bc0d19f33d
Fix typo
2018-11-23 03:03:02 +01:00
Jony
cbc9169973
Update messages.po
2018-11-23 03:01:34 +01:00