Commit Graph

158 Commits (7c89f0b5b97678c8b93a484ee7e5acf746240938)

Author SHA1 Message Date
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
4 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 4 years ago
Ozzieisaacs 513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
4 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 5 years ago
Daniel Pavel a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
5 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 5 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
5 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 5 years ago
Ozzieisaacs 32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
5 years ago
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 5 years ago
Daniel Pavel e254565901 support binding the http server to a unix socket file instead of TCP socket 5 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 5 years ago
Ozzieisaacs 9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
5 years ago
Krakinou 4437d7376d
Merge pull request #2 from Krakinou/flaskldap
Solve typo
5 years ago
Krakinou 304db0d20e Solve typo 5 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
5 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 5 years ago
Daniel Pavel b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
Krakinou 97d12b94f6 Correct settings update 5 years ago
Krakinou e4d801bbaf initial flask_simpleldap implementation 5 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 5 years ago
Ozzieisaacs 4fecce0a0d Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt
5 years ago
Ozzieisaacs ed91048a63 Fix for magic link with python 3 5 years ago
Ozzieisaacs f70c839014 Added additional permission viewer 5 years ago
Ozzieisaacs 0c80f5c63a Update Teststatus 5 years ago
Ozzieisaacs 406d1c76c9 Sorting and filtering of lists working (except file formats)
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
5 years ago
Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
5 years ago
Ozzieisaacs 4552208c02 Fix #848 5 years ago
Ozzieisaacs 3f2a9c8bae Code improvement 5 years ago
Ozzieisaacs 9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 5 years ago
Ozzieisaacs a66873a9e2 Added file formats view 5 years ago
Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
5 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 5 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 5 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 5 years ago
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 5 years ago
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 5 years ago
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 5 years ago
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
5 years ago
Ozzieisaacs 4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago