mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-28 11:00:30 +00:00
Code Issues Releases Wiki Activity
2,190 Commits 4 Branches 24 Tags 103 MiB
ad144922fb
Commit Graph

2190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Shavit
cba3e62e71 Fix issue where books weren't correctly ordered by Date added on the 
Kobo device.
 2020-02-26 01:06:03 -05:00
Ozzieisaacs
dcba720e97 Merge remote-tracking branch 'restrict/patch-1' 2020-02-25 16:06:24 +01:00
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'
 2020-02-25 16:30:51 +03:00
Ozzieisaacs
9a812f11e7 Merge remote-tracking branch 'it/patch-8' 
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
 2020-02-24 19:40:10 +01:00
Ozzieisaacs
917132fe26 Update Translation (german and russian) 
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
 2020-02-24 19:38:12 +01:00
Ozzieisaacs
187ca5dc8f Fix #1221 2020-02-24 19:08:54 +01:00
Ozzieisaacs
7d795771d3 Fix #1221 2020-02-24 19:02:38 +01:00
ElQuimm
e51bc4ea78
Update italian message.po 
Thank you for your job :-)
 2020-02-23 21:23:00 +01:00
Ozzieisaacs
2dc3235d4f Merge branch 'master' into Develop 2020-02-23 20:08:37 +01:00
Ozzieisaacs
040bb4a5a8 Merge remote-tracking branch 'origin/master' 2020-02-23 20:07:51 +01:00
Ozzieisaacs
fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzie Isaacs
5dbdef25d3
Windows compatibility 2020-02-23 17:24:25 +01:00
Ozzie Isaacs
b9f3ac2eea
Windows compatability 2020-02-23 17:23:38 +01:00
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
 2020-02-23 13:27:44 +01:00
Ozzieisaacs
4f81184da0 Update translation 2020-02-23 13:22:57 +01:00
Ozzieisaacs
8223561844 Merge branch 'master' into Develop 2020-02-23 13:21:11 +01:00
Ozzieisaacs
32a6beae65 Merge remote-tracking branch 'fix/kobo' 
# Conflicts:
#	cps/kobo.py
 2020-02-23 13:17:59 +01:00
Ozzieisaacs
146068c936 Merge branch 'Develop' 
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
 2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1' 
Fix #1210 Load multiple authors correct via get metadata
 2020-02-23 13:14:12 +01:00
Ozzieisaacs
e60ef8fc97 Calibre-web version visible in about section 
Update Calibre-web Version info
 2020-02-23 12:40:11 +01:00
Ozzieisaacs
24d755b123 Update translations 
Merge remote-tracking branch 'it/patch-7'
 2020-02-23 10:55:56 +01:00
Ozzieisaacs
7c89f0b5b9 Merge with branch develop 
Release version
 2020-02-23 09:08:01 +01:00
Ozzieisaacs
134a10f56c Merge remote-tracking branch 'origin/Develop' into Develop 
# Conflicts:
#	cps/updater.py
 2020-02-23 08:58:47 +01:00
Ozzieisaacs
3a70c86f49 Update updater to handle venv folders 2020-02-23 08:58:13 +01:00
Ozzieisaacs
ac431bbc4a Limit requirements 2020-02-23 08:58:13 +01:00
OzzieIsaacs
371097eb4d Update Updater 2020-02-23 07:54:58 +01:00
OzzieIsaacs
6346059698 Changed optional-requirements 2020-02-23 06:53:17 +01:00
Ozzieisaacs
372c284ad4 Merge branch 'master' into Develop 2020-02-22 16:24:06 +01:00
Ozzie Isaacs
264ccdbf6d
Update bug_report.md 2020-02-22 13:36:31 +01:00
Ozzie Isaacs
b95150ff11
Update bug report 2020-02-22 13:33:21 +01:00
Ozzie Isaacs
81fc04f24d
Update bug_report.md 2020-02-22 13:29:36 +01:00
Ozzie Isaacs
3d4ebddb04 Update issue templates 2020-02-22 13:27:56 +01:00
Ozzie Isaacs
de299e0d6a Update issue templates 2020-02-22 13:25:31 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210 2020-02-21 18:25:02 -03:00
Ozzieisaacs
b7f3e00fbf Update updater to handle venv folders 2020-02-21 18:04:26 +01:00
Ozzieisaacs
27a18d60a7 Merge remote-tracking branch 'fix/robust_proxy' into Develop 
# Conflicts:
#	cps/kobo.py
 2020-02-19 18:20:03 +01:00
Ozzieisaacs
de8f6d3e8d Limit requirements 2020-02-19 18:15:40 +01:00
Ozzieisaacs
6893635251 Handle kobo auth request 
Handle access from localhost for kobo
 2020-02-18 20:36:32 +01:00
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
 2020-02-17 21:03:33 +01:00
Michael Shavit
7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-02-17 14:49:42 -05:00
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.
 2020-02-17 14:37:02 -05:00
Ozzieisaacs
ba6b5f8fd1 Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master 2020-02-18 00:21:59 +11:00
Niktia Pchelin
dac48a2610 #645 - changes create_shelf and edit_shelf to allow user create public and private shelves with the same name 2020-02-16 23:38:35 -05:00
Niktia Pchelin
7c0d10da79 #645 - displays '(public)' next to user's public shelves in OPDS feed 2020-02-16 22:47:32 -05:00
Niktia Pchelin
d77b52af96 #645 - displays '(public)' next to public shelves created by the user 2020-02-16 22:24:00 -05:00
Ozzieisaacs
29f6463ed9 Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download) 2020-02-16 19:55:05 +01:00
Ozzieisaacs
ed0bdbf31d Fix for #1199 (missing referrer) 2020-02-16 19:39:32 +01:00
Ozzieisaacs
b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 2020-02-16 19:24:28 +01:00
Ozzieisaacs
16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 2020-02-16 19:19:10 +01:00