b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
5 years ago
806a5f209f
Fix two minor xss
5 years ago
ce6b689147
Code cosmetics
5 years ago
2d92818613
Code cosmetics
5 years ago
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
5 years ago
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
5 years ago
d8bf540db2
Remove an undeclared and useless local variable
5 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
5 years ago
a194216568
Merge remote-tracking branch 'origin/master'
5 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
5 years ago
587174b771
Fix #1272
5 years ago
5864637f1c
Merge branch 'master' into Develop
5 years ago
da42c51af2
Updated to exclude new modules
5 years ago
f6c04b9b84
Merge branch 'master' into Develop
5 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
5 years ago
f243515261
Fix #950 (sorting order in comics)
5 years ago
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
5 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
5 years ago
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
5 years ago
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
5 years ago
7c89f0b5b9
Merge with branch develop
...
Release version
5 years ago
371097eb4d
Update Updater
5 years ago
29cb8bfec4
Fix #1210
5 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
5 years ago
509071949a
Moved style to css file
5 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
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
5 years ago
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.
5 years ago
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
5 years ago
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
5 years ago
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
5 years ago
56964a890b
caliBlur theme: fix custom column display that contain colons
5 years ago
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
5 years ago
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
5 years ago
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
5 years ago
c659f28334
Fix #1128
5 years ago
d9adb4fc94
Improvements for limit tags
5 years ago
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
5 years ago
1da4efec86
Merge branch 'master' into Develop
5 years ago
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
5 years ago
bbe91f439a
Merge from master
5 years ago
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
222797e631
support douban book search using apikey
5 years ago
c93dd32179
Fixed typo and column size for LG screens
5 years ago
ada727a570
Adds Authors, Series and Book Cover to the shelf order view
5 years ago
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
5 years ago
Ozzieisaacs