Commit Graph

490 Commits (5864637f1c1bc8da22cafc778f6fcf9b0059a0cd)

Author SHA1 Message Date
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