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
ec6b346ca1
Update Translation
5 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
5 years ago
b89309ab82
Merge remote-tracking branch 'po/master'
5 years ago
2d230ec96a
Updated Teststatus
5 years ago
4550333f1e
Added redirect after create shelf
5 years ago
3ba610eb64
Revert accidentally committed changes in opds feed
5 years ago
2436c6a118
Merge remote-tracking branch 'caliblur/master'
5 years ago
4de80b26c1
Merge remote-tracking branch 'public_shelf/calibre-web_645'
...
# Conflicts:
# cps/templates/feed.xml
# cps/templates/layout.html
5 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
5 years ago
0c27ff11b9
Update Updater
5 years ago
734e2ffbb2
Updated Polish translations
5 years ago
da42c51af2
Updated to exclude new modules
5 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
5 years ago
c870f6e87d
English Language V2
5 years ago
6d907094d7
Update Readme
5 years ago
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
5 years ago
20b07e0752
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
a50ca1a85f
Fix #1259
5 years ago
02199c8c1d
Update messages.po (Swedish)
...
Update Swedish translation
5 years ago
c166c92685
Merge pull request #3 from janeczku/master
...
Update fork
5 years ago
f243515261
Fix #950 (sorting order in comics)
5 years ago
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
5 years ago
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
5 years ago
46b87dc7eb
Fix for testability of kobo
5 years ago
fe7c56d269
italian updated version of messages.po
...
09.03.2020
5 years ago
5ba4801a79
Updated test result
5 years ago
89927fd7e9
Merge ComicVine API
5 years ago
18794831e0
Chang link to issue template
5 years ago
3fb851304f
Merge remote-tracking branch 'ru/master'
5 years ago
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
5 years ago
82afa81220
up
5 years ago
d730eb8d31
fix
5 years ago
5a219b580f
ru update
5 years ago
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
5 years ago
df7d3d18b6
pdf reader
5 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
5 years ago
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
5 years ago
4e8b814ec2
Fix download URL for IPV6
5 years ago
6becca17bf
Merge remote-tracking branch 'fix/fix_time' into Develop
5 years ago
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
5 years ago
0854303710
Update Chinese translation
5 years ago
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
5 years ago
dcba720e97
Merge remote-tracking branch 'restrict/patch-1'
5 years ago
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'
5 years ago
9a812f11e7
Merge remote-tracking branch 'it/patch-8'
...
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
5 years ago
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
5 years ago
187ca5dc8f
Fix #1221
5 years ago
Ozzieisaacs