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
Ozzie Isaacs
0744e84ba9
Fix for sqlalchemy version problem
...
In version 1.3.0 the follwoing error is thrown: Textual SQL expression 'xxx.xxx' should be explicitly declared as text
2019-03-07 20:50:58 +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
