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
2020-05-01 17:25:13 +02:00
Ozzieisaacs
d6f41d8dc0
Fix error 404 on reset password ( Fix #1342 )
2020-05-01 08:33:50 +02:00
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
2020-04-30 18:08:28 +02:00
Ozzieisaacs
01ff55c84e
Removed non working filters for search
2020-04-29 17:57:53 +02:00
Ozzieisaacs
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
2020-04-28 16:50:08 +02:00
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
2020-04-26 18:55:23 +02:00
Ozzieisaacs
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
2020-04-26 18:38:09 +02:00
Ozzieisaacs
dc46ad16ae
Bugfix view shelfs on book detail page
2020-04-26 11:35:47 +02:00
Ozzieisaacs
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
2020-04-26 11:34:10 +02:00
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
2020-04-25 20:06:25 +02:00
Ozzieisaacs
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
2020-04-24 16:56:08 +02:00
Ozzieisaacs
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
celogeek
d093fbb069
Keep previous search value and focus
2020-04-19 13:12:02 +02:00
pthiben
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
2020-04-18 23:32:15 -04:00
pthiben
ea7058e896
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
2020-04-18 23:23:56 -04:00
pthiben
2d66da3cb9
restrict button for grid<->list switch to series lists
2020-04-18 23:23:56 -04:00
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
2020-04-18 23:23:56 -04:00
pthiben
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-18 23:22:51 -04:00
Ozzieisaacs
902685a197
Fix text in user config section (random books in Detail View)
2020-04-18 21:30:28 +02:00
Ozzieisaacs
c04b146486
Fix #1309 (fix duplicate shelf names in book detail view)
2020-04-18 21:15:02 +02:00
Ozzieisaacs
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
2020-04-18 21:12:21 +02:00
Ozzieisaacs
195845ab0c
Fix
2020-04-17 18:17:35 +02:00
Ozzieisaacs
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
2020-04-17 18:16:28 +02:00
Ozzieisaacs
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
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
2020-04-16 17:58:42 +02:00
Ozzieisaacs
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
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
xcffl
70c9dd1b95
Fix opds format errors & extend info
2020-04-11 00:06:50 +08: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
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
Ozzieisaacs
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
Ozzieisaacs
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
Josh O'Brien
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
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
2020-03-12 20:43:39 +01:00
Ozzieisaacs
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +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
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
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
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
Ozzieisaacs
fc4436f091
Update Translation
2020-02-23 20:07:21 +01:00
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
2020-02-23 13:27:44 +01:00
Ozzieisaacs
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
2020-02-18 20:36:32 +01:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
