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
6 years ago
76d40411dd
Translation updated
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
6 years ago
6f80a63ca6
Fix for #827
6 years ago
3dfc2f2580
fixing issue #833
6 years ago
5b0a0e2139
Fix #835
6 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
6f0b3bbda0
Fix for #812
6 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
1561a4abdf
Comic improvments
6 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
466af21548
Code Cosmetics
6 years ago
0224d45961
Code cosmetics
6 years ago
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
6269a83c3d
Fix mismerge user logon with python3 in opds feed
6 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
fda977b155
Fix for users with umlauts
6 years ago
68a36597ab
Fix opds login on python3
6 years ago
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
361a1243d7
Improvements #828
6 years ago
246d7673a9
Corrected file header with copyright information
6 years ago
bd7b0175a1
Fix remaining shown by codacy
6 years ago
f5cf62f209
Fix issues shown by codacy
6 years ago
15aa49e163
shorten authors in author / discover / index / search and shelf
6 years ago
3272b4ca1e
configuration field for max_authors
6 years ago
d3ed0317bb
styling and javascript for hiding authors
6 years ago
e5bc1ae020
Add new database field for storing max_authors
6 years ago
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
6 years ago
fad62a0909
translation update
6 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
1de3929988
Unicode
6 years ago
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
6 years ago
0facb8fffa
Fix #766
6 years ago
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 years ago
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.
6 years ago
17b7333992
Merge remote-tracking branch 'caliblur/master'
6 years ago
ae279c5123
fixed description read-more button
6 years ago
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
ae7c4908f9
Fix #767
6 years ago
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
9a0e8fefb7
re-add loader code
6 years ago
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
6 years ago
5a863541de
Fix object object
6 years ago
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
Ozzieisaacs