14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
9a5ab97d78
Merge branch 'master' into master
2019-06-08 01:41:43 +02:00
79286c9384
encode password
2019-06-08 00:54:45 +02:00
c4e3f3670f
Added public /reconnect endpoint
2019-06-07 12:15:31 +07:00
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
97d12b94f6
Correct settings update
2019-06-04 00:47:49 +02:00
e4d801bbaf
initial flask_simpleldap implementation
2019-06-02 22:07:22 +02:00
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
2019-05-31 16:24:13 +02:00
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
2019-05-31 11:17:47 +02:00
f70c839014
Added additional permission viewer
2019-05-19 18:39:34 +02:00
0c80f5c63a
Update Teststatus
2019-05-12 19:44:52 +02:00
1030e195a5
Fix #916
2019-05-11 13:03:38 +02:00
3b03aa30a6
Fix for advanced search
2019-05-06 20:51:44 +02:00
cb0403a924
Merge remote-tracking branch 'adv_search/master'
2019-05-06 20:48:46 +02:00
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
2019-05-05 17:58:45 +02:00
55bb8d4590
Fix #900
2019-05-01 17:47:54 +02:00
b80bfa5260
Improvement for #897
2019-04-29 19:01:30 +02:00
f941908f73
Workaround for #889
2019-04-23 21:32:48 +02:00
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
2019-04-22 19:17:23 +02:00
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
2019-04-22 19:11:35 +02:00
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
2019-04-20 18:32:46 +02:00
c748716ad2
Fix for opds feed of unread/read books
2019-04-19 12:07:46 +02:00
544405f5aa
Update search for cyrillic letters #877
2019-04-19 06:54:12 +02:00
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
2019-04-18 21:17:59 +02:00
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
2019-04-15 20:57:25 +02:00
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
2019-04-14 18:18:39 +02:00
55bdd13fb1
Fix #877
2019-04-14 17:54:18 +02:00
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
2019-04-13 16:42:09 +02:00
f7e640fd98
support pycountry if iso-639 is not available
2019-03-29 07:00:10 +02:00
4b301a7961
Additional fix for #845 (in case of error)
2019-03-26 18:19:39 +01:00
772f978b45
Improved code quality
2019-03-24 16:24:43 +01:00
0f1db18eae
Simplified typeahead
2019-03-24 16:14:42 +01:00
6940bb9b88
Code improvement
2019-03-24 15:58:43 +01:00
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
2019-03-24 15:27:23 +01:00
8923e71220
Remove debug logging
2019-03-24 15:18:01 +01:00
843a93fe28
Updater fix for slow servers
2019-03-24 15:15:36 +01:00
8ab9365688
Prevent error 500 for cover of not exisiting book
2019-03-23 20:29:53 +01:00
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
2019-03-21 19:18:44 +01:00
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
2019-03-20 13:06:11 +01:00
8e8486497f
Restirct a user to a set of tags
2019-03-19 13:53:41 +00:00
e5593d9a7f
Integrated author in sorting functions
2019-03-16 21:14:01 +01:00
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
2019-03-16 17:20:14 +01:00
baf83b2f5a
Refactored generating download links
2019-03-16 16:23:40 +01:00
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
2019-03-16 15:48:09 +01:00
a66873a9e2
Added file formats view
2019-03-11 18:42:30 +01:00
a0a15b4598
Fix max authors shown
2019-03-10 19:26:39 +01:00
4a33278596
Update ratings
2019-03-10 19:22:35 +01:00
6d2270d931
Fixes for Oauth
2019-03-10 12:54:32 +01:00
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
2019-03-10 08:31:10 +01:00
