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
4 years ago
d6f41d8dc0
Fix error 404 on reset password ( Fix #1342 )
4 years ago
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
4 years ago
01ff55c84e
Removed non working filters for search
4 years ago
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
4 years ago
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
4 years ago
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
4 years ago
dc46ad16ae
Bugfix view shelfs on book detail page
4 years ago
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
4 years ago
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
4 years ago
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
4 years ago
24c743d23d
Code cosmetics
4 years ago
d093fbb069
Keep previous search value and focus
4 years ago
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
4 years ago
ea7058e896
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
4 years ago
2d66da3cb9
restrict button for grid<->list switch to series lists
4 years ago
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
4 years ago
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
902685a197
Fix text in user config section (random books in Detail View)
4 years ago
c04b146486
Fix #1309 (fix duplicate shelf names in book detail view)
4 years ago
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
4 years ago
195845ab0c
Fix
4 years ago
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
4 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
4 years ago
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
4 years ago
a784c6bd52
Fixes for oauth login after programming basic tests
4 years ago
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
4 years ago
70c9dd1b95
Fix opds format errors & extend info
4 years ago
a194216568
Merge remote-tracking branch 'origin/master'
4 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
4 years ago
5864637f1c
Merge branch 'master' into Develop
4 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
4 years ago
4550333f1e
Added redirect after create shelf
4 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
4 years ago
f6c04b9b84
Merge branch 'master' into Develop
4 years ago
c870f6e87d
English Language V2
4 years ago
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
4 years ago
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
4 years ago
89927fd7e9
Merge ComicVine API
4 years ago
18794831e0
Chang link to issue template
4 years ago
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
4 years ago
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
4 years ago
df7d3d18b6
pdf reader
4 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
4 years ago
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
4 years ago
fc4436f091
Update Translation
4 years ago
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
4 years ago
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
4 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
4 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
4 years ago
8f518993a4
Merge branch 'master' into master
4 years ago
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
4 years ago
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
4 years ago
317e59df4b
Bugfixes from tests
4 years ago
a9a6f5b97e
Renamed restrict -> deny
4 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
4 years ago
509071949a
Moved style to css file
4 years ago
726595e117
Update for testability
4 years ago
1666e32aaf
Fixes cover layouts in user edit page
4 years ago
6a69bbe4b5
Fixes cover layouts in user edit page
4 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
4 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
4 years ago
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
4 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
4 years ago
6698773d81
Improved testability
4 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
4 years ago
e44494aad0
Kobo sync enable/disable working
4 years ago
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.
4 years ago
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
4 years ago
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
4 years ago
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
4 years ago
ad71d0a03f
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
4 years ago
0955c6d6fb
Update Kobo
4 years ago
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.
4 years ago
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.
4 years ago
9b119fa724
edit book: manage identifiers
5 years ago
cd9bb56db5
Cleanup Kobo integration
5 years ago
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
5 years ago
ce66c752c4
Updated czech translation
...
removed language selection for guest user
5 years ago
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
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
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
42435ab34a
Improved testablility
5 years ago
661ed17d23
Handle stream output in logviewer
...
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
5 years ago
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
5 years ago
c60277f4d3
Capitalize language selection in User settings
...
Remove sql statement from log.debug statement upon creation of new column in settings database
5 years ago
6a07cfba65
Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
...
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
5 years ago
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
5 years ago
32e818af6a
Fix #1124
5 years ago
d9adb4fc94
Improvements for limit tags
5 years ago
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
5 years ago
1da4efec86
Merge branch 'master' into Develop
5 years ago
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
5 years ago
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
5 years ago
01381488f4
Fixes from tests
5 years ago
54c4f40188
added LDAP import
...
update defaults
5 years ago
bbe91f439a
Merge from master
5 years ago
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
288944db2c
Merge remote-tracking branch 'kobo_sync/kobo' into Develop
...
# Conflicts:
# cps.py
# cps/kobo.py
# cps/kobo_auth.py
# cps/ub.py
5 years ago
f84274f1c5
git add missing generate_kobo_auth_url.html
5 years ago
Ozzieisaacs