Ozzieisaacs
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
2019-06-08 06:52:41 +02:00
Krakinou
9a5ab97d78
Merge branch 'master' into master
2019-06-08 01:41:43 +02:00
Krakinou
6190e64956
Merge pull request #1 from Krakinou/flaskldap
...
Flaskldap integration
2019-06-08 01:03:59 +02:00
Krakinou
79286c9384
encode password
2019-06-08 00:54:45 +02:00
Daniel Pavel
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
Krakinou
97d12b94f6
Correct settings update
2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
2019-06-02 22:07:22 +02:00
Ozzieisaacs
f736a15c12
Fix for restart of newer versions of tornado during update
...
Fix for updater with Beta Versions
2019-06-02 18:47:25 +02:00
Ozzieisaacs
a02f949d23
Fix for updater with beta releases
2019-06-02 18:09:44 +02:00
Ozzieisaacs
b4e0d039ef
Revert setup.cfg file
2019-06-02 09:35:42 +02:00
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
Ozzieisaacs
f5b335e8e9
Update setup
2019-06-01 09:51:20 +02:00
Ozzieisaacs
67bd5d41aa
Update Version info
2019-05-31 20:06:07 +02:00
Ozzieisaacs
1879dcb24a
Merge remote-tracking branch 'setup/feature/setuptools-integration' into Develop
2019-05-31 19:48:09 +02:00
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
2019-05-31 16:24:13 +02:00
Ozzieisaacs
6662a58cb0
Update translationfiles
2019-05-31 15:48:19 +02:00
Luke Murphy
b3a286c0b5
Add initial setuptools integration
2019-05-31 11:54:05 +02:00
Ozzieisaacs
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
Ozzieisaacs
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
2019-05-31 08:43:51 +02:00
Ozzieisaacs
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
2019-05-30 10:43:28 +02:00
Ozzieisaacs
ecedf92783
Update version
...
Make custom columns visible (#904 )
2019-05-30 10:21:11 +02:00
Ozzieisaacs
d106ada9ed
Changed version
...
Update translation
2019-05-30 09:07:52 +02:00
Ozzieisaacs
ed91048a63
Fix for magic link with python 3
2019-05-26 11:31:09 +02:00
Ozzieisaacs
f70c839014
Added additional permission viewer
2019-05-19 18:39:34 +02:00
Ozzieisaacs
e6ff2f1d90
Fix file not found loading-icon.gif
2019-05-16 19:42:59 +02:00
subdiox
867aa2f0bd
Beautify bitjs
2019-05-14 04:28:06 +09:00
subdiox
7982ed877c
Downgrade bitjs to es5 branch
2019-05-13 14:53:25 +09:00
Ozzieisaacs
0c80f5c63a
Update Teststatus
2019-05-12 19:44:52 +02:00
Ozzieisaacs
1030e195a5
Fix #916
2019-05-11 13:03:38 +02:00
subdiox
c0d136ccd8
Fix slow loading
2019-05-10 08:16:03 +09:00
Ozzieisaacs
479b4b7d82
Update translations, integrated update of Italian translation
2019-05-08 20:24:10 +02:00
Ozzieisaacs
a42ebdc096
Fix for #897
2019-05-07 19:54:13 +02:00
Ozzieisaacs
49ba221e85
Merge remote-tracking branch 'direction'
2019-05-07 18:54:27 +02:00
Ozzieisaacs
3b03aa30a6
Fix for advanced search
2019-05-06 20:51:44 +02:00
Ozzieisaacs
cb0403a924
Merge remote-tracking branch 'adv_search/master'
2019-05-06 20:48:46 +02:00
Marvin Marx
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
Ozzieisaacs
55bb8d4590
Fix #900
2019-05-01 17:47:54 +02:00
Ozzieisaacs
b80bfa5260
Improvement for #897
2019-04-29 19:01:30 +02:00
Ozzieisaacs
f941908f73
Workaround for #889
2019-04-23 21:32:48 +02:00
Ozzieisaacs
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
2019-04-22 19:17:23 +02:00
Ozzieisaacs
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
subdiox
c2bfb29726
Add reading direction settings to readcbr page
2019-04-21 18:20:15 +09:00
subdiox
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
2019-04-21 18:02:02 +09:00
subdiox
8b6d165d64
Fix Japanese translation
2019-04-21 17:53:40 +09:00
Ozzieisaacs
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
2019-04-21 08:50:31 +02:00
Ozzieisaacs
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
2019-04-21 08:48:51 +02:00
Ozzieisaacs
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
Ozzieisaacs
f1a65a2aeb
Clarified licences for isolanguages.py and reverseproxy.py
2019-04-20 17:57:06 +02:00
Ozzieisaacs
cc5c2c0f65
Update Version info
2019-04-20 12:30:33 +02:00
Ozzieisaacs
c748716ad2
Fix for opds feed of unread/read books
2019-04-19 12:07:46 +02:00
