Commit Graph
1822 Commits
Author SHA1 Message Date
Ozzieisaacs 4749eccfa5 Added fix for python2 regex
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
2020-04-14 10:58:32 +02:00
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 2020-04-05 19:10:27 +02:00
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
2020-04-05 17:31:41 +02:00
Ozzie Isaacs 25ab3cabfe Add question for logfile to Issue Template 2020-04-04 18:28:43 +02:00
Ozzieisaacs 587174b771 Fix #1272 2020-04-04 08:53:22 +02:00
Ozzieisaacs ec6b346ca1 Update Translation 2020-04-03 19:50:29 +02:00
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master' 2020-04-03 19:27:10 +02:00
OzzieIsaacs 2d230ec96a Updated Teststatus 2020-04-02 21:13:43 +02:00
Ozzieisaacs 4550333f1e Added redirect after create shelf 2020-04-02 20:19:05 +02:00
Ozzieisaacs 3ba610eb64 Revert accidentally committed changes in opds feed 2020-04-02 19:07:41 +02:00
Ozzieisaacs 2436c6a118 Merge remote-tracking branch 'caliblur/master' 2020-04-02 18:27:21 +02:00
Ozzieisaacs 4de80b26c1 Merge remote-tracking branch 'public_shelf/calibre-web_645'
# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html
2020-04-02 18:24:32 +02:00
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 2020-04-02 18:23:24 +02:00
Ozzieisaacs 0c27ff11b9 Update Updater 2020-04-01 18:45:16 +02:00
BeckyDTP 734e2ffbb2 Updated Polish translations 2020-03-31 21:53:13 +02:00
hexeth da42c51af2 Updated to exclude new modules 2020-03-31 08:42:08 -07:00
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
Josh O'Brien c870f6e87d English Language V2 2020-03-19 13:10:10 +11:00
Ozzieisaacs 6d907094d7 Update Readme 2020-03-14 11:22:27 +01:00
Ozzieisaacs 6643f0d1e0 Merge remote-tracking branch 'nl/master'
# Conflicts:
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
2020-03-14 10:45:58 +01:00
Ozzieisaacs 20b07e0752 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:39:27 +01:00
Ozzieisaacs 092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs a50ca1a85f Fix #1259 2020-03-14 10:35:58 +01:00
Jony 02199c8c1d Update messages.po (Swedish)
Update Swedish translation
2020-03-14 09:32:33 +01:00
Jony c166c92685 Merge pull request #3 from janeczku/master
Update fork
2020-03-14 09:31:29 +01:00
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 2020-03-14 07:15:15 +01:00
Unknown 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
2020-03-13 14:01:42 +01:00
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 2020-03-12 20:32:08 +01:00
Ozzieisaacs 46b87dc7eb Fix for testability of kobo 2020-03-09 20:25:59 +01:00
ElQuimm fe7c56d269 italian updated version of messages.po
09.03.2020
2020-03-09 09:11:41 +01:00
OzzieIsaacs 5ba4801a79 Updated test result 2020-03-08 08:02:15 +01:00
Ozzieisaacs 89927fd7e9 Merge ComicVine API 2020-03-07 13:33:35 +01:00
Ozzieisaacs 18794831e0 Chang link to issue template 2020-03-07 11:27:50 +01:00
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master' 2020-03-07 11:21:10 +01:00
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
2020-03-07 11:07:43 +01:00
ZIzA 82afa81220 up 2020-02-29 20:41:51 +04:00
ZIzA d730eb8d31 fix 2020-02-29 20:26:52 +04:00
ZIzA 5a219b580f ru update 2020-02-29 19:10:01 +04:00
Ozzieisaacs fb83bfb363 Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge) 2020-02-29 09:55:54 +01:00
Ozzie Isaacs df7d3d18b6 pdf reader 2020-02-29 08:33:09 +01:00
Wanoo a0535aa3db Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
Ozzieisaacs 202b6121ab Fix for #1227 (Download books not possible with gevent IPV6 connection)
Fix issue where books aren't correctly ordered by Date Added
2020-02-26 20:05:44 +01:00
Ozzieisaacs 4e8b814ec2 Fix download URL for IPV6 2020-02-26 20:04:15 +01:00
Ozzieisaacs 6becca17bf Merge remote-tracking branch 'fix/fix_time' into Develop 2020-02-26 18:09:01 +01:00
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 2020-02-26 18:03:26 +01:00
Jeff 0854303710 Update Chinese translation 2020-02-26 19:47:25 +08:00
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