Commit Graph

590 Commits (6c552f6b4333e5570ac95c9fbe7978cdb47b0d68)

Author SHA1 Message Date
Ozzieisaacs 742799b4ac Added missing float custom column to search form 5 years ago
Ozzieisaacs 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
5 years ago
Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/book_edit.html
5 years ago
Ozzieisaacs 44d5adc16f Fix #1390 5 years ago
Ozzieisaacs f749fc641b Temporary fix for #1390 5 years ago
Ozzieisaacs 87c76c09e2 temporary fix for #1390 5 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 5 years ago
Ozzieisaacs ec7d5b17ab Added table view for books 5 years ago
Ozzieisaacs f7269d8df2 Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu) 5 years ago
Ozzieisaacs ce0fab8d2f Fix duplicate shelf names in "search" 5 years ago
Ozzieisaacs 308fd55483 #1141 (Setting for file size limit on email) 5 years ago
Ozzieisaacs 0a02caad04 Improvements 5 years ago
Ozzieisaacs a437c603c6 Merge remote-tracking branch 'kepubify/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py
5 years ago
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
5 years ago
Ozzieisaacs e1439b529b Config Options for limiting email size, change username to e-mail adress, use kepubify
Added work on Unrar5 decompression (breaks comic reader totally)
5 years ago
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
5 years ago
Ozzieisaacs 0138ff9e16 Added additional config options 5 years ago
Ozzieisaacs 9bc085a23e Fixes for comic reader 5 years ago
Ozzieisaacs 0a92d79ec0 Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 5 years ago
Ozzieisaacs b160a8de0b Merge branch 'master' into Develop
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
5 years ago
Ozzieisaacs 01ff55c84e Removed non working filters for search 5 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 5 years ago
Ozzieisaacs 44284ea5fb Merge remote-tracking branch 'opds/master'
# Conflicts:
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
5 years ago
Ozzieisaacs 87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 5 years ago
Ozzieisaacs dc46ad16ae Bugfix view shelfs on book detail page 5 years ago
Ozzieisaacs 456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
5 years ago
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
5 years ago
Ozzieisaacs e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
5 years ago
Ozzieisaacs 24c743d23d Code cosmetics 5 years ago
celogeek d093fbb069
Keep previous search value and focus 5 years ago
pthiben a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
5 years ago
pthiben ea7058e896 Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 5 years ago
pthiben 2d66da3cb9 restrict button for grid<->list switch to series lists 5 years ago
pthiben b7efbf9040 resynced grid view with list view
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
5 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
Ozzieisaacs 902685a197 Fix text in user config section (random books in Detail View) 5 years ago
Ozzieisaacs c04b146486 Fix #1309 (fix duplicate shelf names in book detail view) 5 years ago
Ozzieisaacs 7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 5 years ago
Ozzieisaacs 195845ab0c Fix 5 years ago
Ozzieisaacs 81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 5 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs 2c42972230 Fix for #1307 (Oauth login not working)
- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account
5 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 5 years ago
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
5 years ago
xcffl 70c9dd1b95 Fix opds format errors & extend info 5 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
5 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 5 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 5 years ago
Ozzieisaacs 4550333f1e Added redirect after create shelf 5 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 5 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 5 years ago
Josh O'Brien c870f6e87d English Language V2 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 8cbc345f36 Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop 5 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 5 years ago
Ozzieisaacs 18794831e0 Chang link to issue template 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
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 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 fc4436f091 Update Translation 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 6893635251 Handle kobo auth request
Handle access from localhost for kobo
5 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 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
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 5 years ago
Ozzieisaacs e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 5 years ago
Ozzieisaacs 317e59df4b Bugfixes from tests 5 years ago
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 5 years ago
Ozzieisaacs 8b1444ebc2 Improved testability
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
Kyos 509071949a Moved style to css file 5 years ago
Ozzieisaacs 726595e117 Update for testability 5 years ago
Kyos 1666e32aaf Fixes cover layouts in user edit page 5 years ago
Kyos 6a69bbe4b5 Fixes cover layouts in user edit page 5 years ago
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs ab24ed8088 Handle sorting of hidden books #1123
Prevent downloading of covers from hidden books
5 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
5 years ago
Ozzieisaacs 6698773d81 Improved testability 5 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
5 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 5 years ago
Michael Shavit f9dbc6bc78 Clean-up book from ArchivedBook on hard-delete.
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
5 years ago
Michael Shavit 9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 5 years ago
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
5 years ago
Ozzieisaacs 0411d4a8c9 Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
5 years ago
Ozzieisaacs ad71d0a03f Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop 5 years ago
Ozzieisaacs 0955c6d6fb Update Kobo 5 years ago
Michael Shavit c0239a659c Add UI support for archived books.
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
5 years ago
Simon Latapie 69fa7d0091 new user: disable kobo token on new user page
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
5 years ago
Simon Latapie 9b119fa724 edit book: manage identifiers 5 years ago
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 5 years ago
Ozzieisaacs 65105d9dbe Merge remote-tracking branch 'cc/develop/custom_float' into Develop 5 years ago
Ozzieisaacs ce66c752c4 Updated czech translation
removed language selection for guest user
5 years ago
Ozzieisaacs 1d7e52c198 Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
5 years ago
Ozzieisaacs 79a9ef4859 Make Kobo optional
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
5 years ago
Ozzieisaacs 8143c16c14 Added texts for allowed denied tags in configuration
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
5 years ago