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
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
2020-04-26 18:50:28 +02:00
Ozzieisaacs
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
2020-04-26 18:38:09 +02:00
Ozzieisaacs
898e6b4f80
Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods)
2020-04-26 18:24:22 +02:00
Ozzieisaacs
dea2600913
Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy
2020-04-26 18:23:16 +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
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
2020-04-26 08:40:53 +02:00
Ozzieisaacs
0480d493cf
Fix opds login with ldap, if ldap server is down
2020-04-25 21:12:07 +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
8b8fe7a0ae
bugfix on create shelv via kobo sync protocol
...
bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404
2020-04-25 20:02:55 +02:00
Ozzie Isaacs
85ffc90f66
Update markup
2020-04-25 08:56:51 +02:00
Ozzieisaacs
fa38798066
Added contributing file
2020-04-25 08:55:01 +02:00
Ozzieisaacs
d657330584
Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326
2020-04-25 07:13:55 +02:00
Ozzieisaacs
36cb79de62
Merge remote-tracking branch 'turkish/master'
2020-04-24 22:14:57 +02:00
Ozzieisaacs
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
2020-04-24 21:05:56 +02:00
Ozzieisaacs
7393b69757
Fix for #1326 (typo)
2020-04-24 19:25:11 +02:00
Ozzieisaacs
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
2020-04-24 18:37:29 +02:00
jvoisin
d8bf540db2
Remove an undeclared and useless local variable
2020-04-24 18:04:27 +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
iz
1770f3fd0d
Update turkish translation headers
2020-04-23 22:47:24 +03:00
iz
4239f2ed71
Add turkish translation
2020-04-23 22:37:44 +03:00
iz
3939ec28ba
Add turkish language names
2020-04-23 22:37:35 +03:00
Michael Shavit
742ec2b38d
Fix issue with the delete_book changes introduced in
...
41a3623
2020-04-22 00:19:33 -04:00
Michael Shavit
9296d35517
Fix bug with shelf deletions for Kobo.
...
We were incorrectly setting the user_id field in the ShelfArchive table
2020-04-21 23:57:20 -04:00
Michael Shavit
06c15a792e
Minor fixes to the Kobo shelves implementation (mostly typos)
2020-04-21 23:36:47 -04:00
Ozzieisaacs
95ca1e6a9d
Fix for #1319
2020-04-20 18:56:39 +02:00
Ozzieisaacs
1df82110d1
Update Italian language translation
2020-04-19 19:13:10 +02:00
Ozzieisaacs
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
ElQuimm
f1b1ebe29e
Updated italian version of messages.po
2020-04-19 16:38:30 +02:00
Jeff
6384cdc74d
Fix https github oauth
...
while using https domian and nginx as proxy, a `ProxyFix` is required.
2020-04-19 19:53:41 +08:00
celogeek
d093fbb069
Keep previous search value and focus
2020-04-19 13:12:02 +02:00
celogeek
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
2020-04-19 13:03:46 +02: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
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
2020-04-18 11:48:34 +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
cd6272a1c9
Update teststatus
2020-04-16 22:00:39 +02:00
Ozzieisaacs
53be752787
Merge remote-tracking branch 'it/patch-10'
2020-04-16 20:17:02 +02:00
Ozzieisaacs
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
2020-04-16 20:14:56 +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
aribes
f926e58891
Changing ordering logic when showing books from a category
2020-04-16 11:37:04 +10:00
Ozzieisaacs
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
ElQuimm
05d78f5cb5
Update italian version of message.po
...
Have a nice day!
2020-04-15 10:59:08 +02:00
Ozzieisaacs
ce4f1258b5
Fix #1293 (error 500 on search without query)
2020-04-14 19:27:18 +02:00
Ozzieisaacs
3fbaba6693
Fix #1307
2020-04-14 18:28:16 +02:00
Ozzieisaacs
a8b36aed92
Temporary fix for #1307
2020-04-14 14:13:54 +02:00
