Ozzieisaacs
|
cd546eb6d4
|
Update comic reader js
|
6 years ago |
|
Ozzieisaacs
|
f40fc5aa75
|
Update LDAP
|
6 years ago |
|
Ozzieisaacs
|
9b74d51f21
|
Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
|
6 years ago |
|
Ozzieisaacs
|
d45b1b8ea5
|
Fix #937
logviewerintegrated
Code cosmetics
|
6 years ago |
|
Ozzieisaacs
|
e67d707867
|
Fix for #588
Merge remote-tracking branch 'linuxserver/master'
|
6 years ago |
|
Krakinou
|
4437d7376d
|
Merge pull request #2 from Krakinou/flaskldap
Solve typo
|
6 years ago |
|
Krakinou
|
304db0d20e
|
Solve typo
|
6 years ago |
|
Ozzieisaacs
|
3f5c6c1fa5
|
Fix #937
|
6 years ago |
|
Ozzieisaacs
|
26949970d8
|
Revert logging functions
Fix access logger for tornado
|
6 years ago |
|
Ozzieisaacs
|
f5e3ed26b9
|
Fix for #935
|
6 years ago |
|
Ozzieisaacs
|
8e4539cf8e
|
Prevent delete of last admin user
|
6 years ago |
|
Ozzieisaacs
|
c81d4edb7d
|
Fix for #923
|
6 years ago |
|
Ozzieisaacs
|
546ed65e1d
|
Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
|
6 years ago |
|
Ozzieisaacs
|
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
|
6 years ago |
|
Ozzieisaacs
|
50973ffb72
|
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
|
6 years ago |
|
Krakinou
|
9a5ab97d78
|
Merge branch 'master' into master
|
6 years ago |
|
Krakinou
|
6190e64956
|
Merge pull request #1 from Krakinou/flaskldap
Flaskldap integration
|
6 years ago |
|
Krakinou
|
79286c9384
|
encode password
|
6 years ago |
|
yjouanique
|
c4e3f3670f
|
Added public /reconnect endpoint
|
6 years ago |
|
Daniel Pavel
|
b89ab9ff10
|
logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
|
6 years ago |
|
Krakinou
|
97d12b94f6
|
Correct settings update
|
6 years ago |
|
Krakinou
|
e4d801bbaf
|
initial flask_simpleldap implementation
|
6 years ago |
|
Ozzieisaacs
|
f736a15c12
|
Fix for restart of newer versions of tornado during update
Fix for updater with Beta Versions
|
6 years ago |
|
Ozzieisaacs
|
a02f949d23
|
Fix for updater with beta releases
|
6 years ago |
|
Ozzieisaacs
|
b4e0d039ef
|
Revert setup.cfg file
|
6 years ago |
|
Ozzieisaacs
|
bb0d5c5538
|
Working for pip and "normal" start for python3 and python2
|
6 years ago |
|
Ozzieisaacs
|
f5b335e8e9
|
Update setup
|
6 years ago |
|
Ozzieisaacs
|
67bd5d41aa
|
Update Version info
|
6 years ago |
|
Ozzieisaacs
|
1879dcb24a
|
Merge remote-tracking branch 'setup/feature/setuptools-integration' into Develop
|
6 years ago |
|
Ozzieisaacs
|
87ca05f129
|
Merge remote-tracking branch 'setup/feature/setuptools-integration'
|
6 years ago |
|
Ozzieisaacs
|
6662a58cb0
|
Update translationfiles
|
6 years ago |
 Luke Murphy
|
b3a286c0b5
|
Add initial setuptools integration
|
6 years ago |
|
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
|
6 years ago |
|
Ozzieisaacs
|
26e45f1f57
|
Merge remote-tracking branch 'comic-reader/master'
|
6 years ago |
|
Ozzieisaacs
|
df5d15d1a2
|
Merge remote-tracking branch 'comicapi/master'
|
6 years ago |
|
Ozzieisaacs
|
ecedf92783
|
Update version
Make custom columns visible (#904)
|
6 years ago |
|
Ozzieisaacs
|
d106ada9ed
|
Changed version
Update translation
|
6 years ago |
|
Ozzieisaacs
|
ed91048a63
|
Fix for magic link with python 3
|
6 years ago |
|
Ozzieisaacs
|
f70c839014
|
Added additional permission viewer
|
6 years ago |
|
Ozzieisaacs
|
e6ff2f1d90
|
Fix file not found loading-icon.gif
|
6 years ago |
|
subdiox
|
867aa2f0bd
|
Beautify bitjs
|
6 years ago |
|
subdiox
|
7982ed877c
|
Downgrade bitjs to es5 branch
|
6 years ago |
|
Ozzieisaacs
|
0c80f5c63a
|
Update Teststatus
|
6 years ago |
|
Ozzieisaacs
|
1030e195a5
|
Fix #916
|
6 years ago |
|
subdiox
|
c0d136ccd8
|
Fix slow loading
|
6 years ago |
|
Ozzieisaacs
|
479b4b7d82
|
Update translations, integrated update of Italian translation
|
6 years ago |
|
Ozzieisaacs
|
a42ebdc096
|
Fix for #897
|
6 years ago |
|
Ozzieisaacs
|
49ba221e85
|
Merge remote-tracking branch 'direction'
|
6 years ago |
|
Ozzieisaacs
|
3b03aa30a6
|
Fix for advanced search
|
6 years ago |
|
Ozzieisaacs
|
cb0403a924
|
Merge remote-tracking branch 'adv_search/master'
|
6 years ago |