Commit Graph

1868 Commits (e29f17ac46a0368faf8d3420bf4611af8f2621a1)
 

Author SHA1 Message Date
Michael Shavit de0e27c512 Fix #1164 merge. 5 years ago
Ozzieisaacs 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
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop
# Conflicts:
#	cps/kobo.py
5 years ago
Ozzieisaacs 98dc991339 Merge remote-tracking branch 'more_kobo_fixes' into Develop 5 years ago
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 5 years ago
Ozzieisaacs 46b87dc7eb Fix for testability of kobo 5 years ago
ElQuimm fe7c56d269
italian updated version of messages.po
09.03.2020
5 years ago
OzzieIsaacs 5ba4801a79 Updated test result 5 years ago
Michael Shavit ad564e25ca More fixes for Kobo Sync
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
5 years ago
Ozzieisaacs 404be948d4 Merge remote-tracking branch 'ldap/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/web.py
5 years ago
Ozzieisaacs 8cbc345f36 Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop 5 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 5 years ago
Ozzieisaacs 6b4a024234 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 18794831e0 Chang link to issue template 5 years ago
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master' 5 years ago
Ozzieisaacs 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
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 5 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 5 years ago
ZIzA 82afa81220
up 5 years ago
ZIzA d730eb8d31
fix 5 years ago
ZIzA 5a219b580f
ru update 5 years ago
Ozzieisaacs fb83bfb363 Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge) 5 years ago
Ozzie Isaacs df7d3d18b6 pdf reader 5 years ago
Wanoo a0535aa3db Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
5 years ago
Ozzieisaacs 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
Ozzieisaacs 4e8b814ec2 Fix download URL for IPV6 5 years ago
Ozzieisaacs 6becca17bf Merge remote-tracking branch 'fix/fix_time' into Develop 5 years ago
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 5 years ago
Jeff 0854303710
Update Chinese translation 5 years ago
Michael Shavit cba3e62e71 Fix issue where books weren't correctly ordered by Date added on the
Kobo device.
5 years ago
Ozzieisaacs dcba720e97 Merge remote-tracking branch 'restrict/patch-1' 5 years ago
Rewerson 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
Ozzieisaacs 9a812f11e7 Merge remote-tracking branch 'it/patch-8'
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
5 years ago
Ozzieisaacs 917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
5 years ago
Ozzieisaacs 187ca5dc8f Fix #1221 5 years ago
Ozzieisaacs 7d795771d3 Fix #1221 5 years ago
ElQuimm e51bc4ea78
Update italian message.po
Thank you for your job :-)
5 years ago
Ozzieisaacs 2dc3235d4f Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 040bb4a5a8 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs fc4436f091 Update Translation 5 years ago
Ozzie Isaacs 5dbdef25d3
Windows compatibility 5 years ago
Ozzie Isaacs b9f3ac2eea
Windows compatability 5 years ago
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
5 years ago
Ozzieisaacs 4f81184da0 Update translation 5 years ago
Ozzieisaacs 8223561844 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 32a6beae65 Merge remote-tracking branch 'fix/kobo'
# Conflicts:
#	cps/kobo.py
5 years ago
Ozzieisaacs 146068c936 Merge branch 'Develop'
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
5 years ago
Ozzieisaacs 3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1'
Fix #1210 Load multiple authors correct via get metadata
5 years ago
Ozzieisaacs e60ef8fc97 Calibre-web version visible in about section
Update Calibre-web Version info
5 years ago
Ozzieisaacs 24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
5 years ago