0dd0605a1f
Book list for merging
5 years ago
827b0c6e50
Changed pubdate to timestamp
5 years ago
13ae28edab
Fix #1449 (Shelf download menu wasn't working for books with more than one format)
5 years ago
94592b74a6
Merge branch 'master' into Develop
5 years ago
eef2112e1e
#1430 (changed color of rating stars)
5 years ago
89223760e6
Merge branch 'master' into Develop
5 years ago
fec86c2862
Update Grid/list view of series
5 years ago
b852fb0e26
Merge branch 'Develop'
5 years ago
0fc18bf3b1
Fix for #1398 (prevent empty series_index field)
5 years ago
ec3a3a73ef
Merge branch 'master' into Develop
5 years ago
087c4c5929
Merge remote-tracking branch 'opds/master'
5 years ago
e0ee2e0801
Merge remote-tracking branch 'typo/master'
5 years ago
c79a9e9858
Fix typo "Shelfs" to "Shelves"
5 years ago
b7535b9526
Merging master branch
...
- fix title sort function
- fix focus on search
5 years ago
cc856c7cd1
Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'
5 years ago
051ffdda35
activate search focus if search in progress
5 years ago
22fae51c9d
Fix XML parsing error when using OPDS feeds
...
Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403 for more
information.
5 years ago
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
5 years ago
742799b4ac
Added missing float custom column to search form
5 years ago
273572f44c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/ub.py
5 years ago
0cc2b49296
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/book_edit.html
5 years ago
44d5adc16f
Fix #1390
5 years ago
f749fc641b
Temporary fix for #1390
5 years ago
87c76c09e2
temporary fix for #1390
5 years ago
e787f9dd9f
Automatic username ( #1172 )
5 years ago
ec7d5b17ab
Added table view for books
5 years ago
f7269d8df2
Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)
5 years ago
ce0fab8d2f
Fix duplicate shelf names in "search"
5 years ago
308fd55483
#1141 (Setting for file size limit on email)
5 years ago
0a02caad04
Improvements
5 years ago
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
5 years ago
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
5 years ago
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
5 years ago
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
5 years ago
0138ff9e16
Added additional config options
5 years ago
9bc085a23e
Fixes for comic reader
5 years ago
0a92d79ec0
Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/ub.py
# cps/web.py
5 years ago
d6f41d8dc0
Fix error 404 on reset password ( Fix #1342 )
5 years ago
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
01ff55c84e
Removed non working filters for search
5 years ago
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
5 years ago
44284ea5fb
Merge remote-tracking branch 'opds/master'
...
# Conflicts:
# 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
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
5 years ago
dc46ad16ae
Bugfix view shelfs on book detail page
5 years ago
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
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
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
5 years ago
24c743d23d
Code cosmetics
5 years ago
d093fbb069
Keep previous search value and focus
5 years ago
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
5 years ago
Ozzieisaacs