Commit Graph

2089 Commits (dde7cf18f70e0e00f0f81fbb6354f65c7d36ba30)
 

Author SHA1 Message Date
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
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
5 years ago
Ozzieisaacs 134a10f56c Merge remote-tracking branch 'origin/Develop' into Develop
# Conflicts:
#	cps/updater.py
5 years ago
Ozzieisaacs 3a70c86f49 Update updater to handle venv folders 5 years ago
Ozzieisaacs ac431bbc4a Limit requirements 5 years ago
OzzieIsaacs 371097eb4d Update Updater 5 years ago
OzzieIsaacs 6346059698 Changed optional-requirements 5 years ago
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 5 years ago
Ozzie Isaacs 264ccdbf6d
Update bug_report.md 5 years ago
Ozzie Isaacs b95150ff11
Update bug report 5 years ago
Ozzie Isaacs 81fc04f24d
Update bug_report.md 5 years ago
Ozzie Isaacs 3d4ebddb04 Update issue templates 5 years ago
Ozzie Isaacs de299e0d6a Update issue templates 5 years ago
Johnny A. dos Santos 29cb8bfec4
Fix #1210 5 years ago
Ozzieisaacs b7f3e00fbf Update updater to handle venv folders 5 years ago
Ozzieisaacs 27a18d60a7 Merge remote-tracking branch 'fix/robust_proxy' into Develop
# Conflicts:
#	cps/kobo.py
5 years ago
Ozzieisaacs de8f6d3e8d Limit requirements 5 years ago
Ozzieisaacs 6893635251 Handle kobo auth request
Handle access from localhost for kobo
5 years ago
ElQuimm 94a38a3b47
udate message.po in italian
Hello, 
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
5 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 5 years ago
Michael Shavit df3eb40e3c Make KoboStore proxying more robust.
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
5 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 5 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 5 years ago
Niktia Pchelin dac48a2610 #645 - changes create_shelf and edit_shelf to allow user create public and private shelves with the same name 5 years ago
Niktia Pchelin 7c0d10da79 #645 - displays '(public)' next to user's public shelves in OPDS feed 5 years ago
Niktia Pchelin d77b52af96 #645 - displays '(public)' next to public shelves created by the user 5 years ago
Ozzieisaacs 29f6463ed9 Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download) 5 years ago
Ozzieisaacs ed0bdbf31d Fix for #1199 (missing referrer) 5 years ago
Ozzieisaacs b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 5 years ago
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 5 years ago
Ozzieisaacs 3f578122a3 Merge remote-tracking branch 'it/patch-6' 5 years ago