Ozzieisaacs
e411c0fded
Fix logging in debug mode
5 years ago
Ozzieisaacs
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
5 years ago
Ozzieisaacs
792367e35e
Version update
5 years ago
Ozzieisaacs
be64961de5
Code cosmetics comic reader
5 years ago
Ozzieisaacs
405a3909b0
Fix for opds with LDAP authentication
5 years ago
Ozzieisaacs
b1cb7123a3
Fix for #959
5 years ago
Ozzieisaacs
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
5 years ago
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
Ozzieisaacs
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
5 years ago
Ozzieisaacs
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
5 years ago
Ozzieisaacs
ad44e58c7a
Sorting for comics
...
Audiobook support
5 years ago
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
5 years ago
Ozzieisaacs
32af660f86
Improvements for logfile viewer
...
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
5 years ago
Ozzieisaacs
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
5 years ago
Ozzieisaacs
5c7aeb2f2c
Change GDrive
5 years ago
Daniel Pavel
e254565901
support binding the http server to a unix socket file instead of TCP socket
5 years ago
Heimen Stoffels
d9f69ca264
Updated Dutch translation
5 years ago
Ozzieisaacs
cd546eb6d4
Update comic reader js
5 years ago
Ozzieisaacs
f40fc5aa75
Update LDAP
5 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
5 years ago
Ozzieisaacs
d45b1b8ea5
Fix #937
...
logviewerintegrated
Code cosmetics
5 years ago
Ozzieisaacs
e67d707867
Fix for #588
...
Merge remote-tracking branch 'linuxserver/master'
5 years ago
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
5 years ago
Krakinou
304db0d20e
Solve typo
5 years ago
Ozzieisaacs
3f5c6c1fa5
Fix #937
5 years ago
Ozzieisaacs
26949970d8
Revert logging functions
...
Fix access logger for tornado
5 years ago
Ozzieisaacs
f5e3ed26b9
Fix for #935
5 years ago
Ozzieisaacs
8e4539cf8e
Prevent delete of last admin user
5 years ago
Ozzieisaacs
c81d4edb7d
Fix for #923
5 years ago
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 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
5 years ago
Ozzieisaacs
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
5 years ago
Krakinou
9a5ab97d78
Merge branch 'master' into master
5 years ago
Krakinou
79286c9384
encode password
5 years ago
yjouanique
c4e3f3670f
Added public /reconnect endpoint
5 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
5 years ago
Krakinou
97d12b94f6
Correct settings update
5 years ago
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
5 years ago
Ozzieisaacs
f736a15c12
Fix for restart of newer versions of tornado during update
...
Fix for updater with Beta Versions
5 years ago
Ozzieisaacs
a02f949d23
Fix for updater with beta releases
5 years ago
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
5 years ago
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
5 years ago
Ozzieisaacs
6662a58cb0
Update translationfiles
5 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
5 years ago
Ozzieisaacs
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
5 years ago
Ozzieisaacs
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
5 years ago
Ozzieisaacs
ecedf92783
Update version
...
Make custom columns visible (#904 )
5 years ago
Ozzieisaacs
d106ada9ed
Changed version
...
Update translation
5 years ago
Ozzieisaacs
ed91048a63
Fix for magic link with python 3
5 years ago
Ozzieisaacs
f70c839014
Added additional permission viewer
5 years ago
Ozzieisaacs
e6ff2f1d90
Fix file not found loading-icon.gif
5 years ago
subdiox
867aa2f0bd
Beautify bitjs
5 years ago
subdiox
7982ed877c
Downgrade bitjs to es5 branch
5 years ago
Ozzieisaacs
0c80f5c63a
Update Teststatus
5 years ago
Ozzieisaacs
1030e195a5
Fix #916
5 years ago
subdiox
c0d136ccd8
Fix slow loading
5 years ago
Ozzieisaacs
479b4b7d82
Update translations, integrated update of Italian translation
5 years ago
Ozzieisaacs
a42ebdc096
Fix for #897
5 years ago
Ozzieisaacs
49ba221e85
Merge remote-tracking branch 'direction'
5 years ago
Ozzieisaacs
3b03aa30a6
Fix for advanced search
5 years ago
Ozzieisaacs
cb0403a924
Merge remote-tracking branch 'adv_search/master'
5 years ago
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.
5 years ago
Ozzieisaacs
55bb8d4590
Fix #900
5 years ago
Ozzieisaacs
b80bfa5260
Improvement for #897
5 years ago
Ozzieisaacs
f941908f73
Workaround for #889
5 years ago
Ozzieisaacs
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
5 years ago
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
5 years ago
subdiox
c2bfb29726
Add reading direction settings to readcbr page
5 years ago
subdiox
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
5 years ago
subdiox
8b6d165d64
Fix Japanese translation
5 years ago
Ozzieisaacs
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
5 years ago
Ozzieisaacs
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
5 years ago
Ozzieisaacs
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
5 years ago
Ozzieisaacs
f1a65a2aeb
Clarified licences for isolanguages.py and reverseproxy.py
5 years ago
Ozzieisaacs
cc5c2c0f65
Update Version info
5 years ago
Ozzieisaacs
c748716ad2
Fix for opds feed of unread/read books
5 years ago
Ozzieisaacs
544405f5aa
Update search for cyrillic letters #877
5 years ago
Ozzieisaacs
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
5 years ago
Ozzieisaacs
89516fc2d6
Make PIL optional #885
5 years ago
Ozzieisaacs
e1e79a73e8
Fix #884
5 years ago
Ozzieisaacs
0b8624b542
Deleted load metadata from douban, as API seems to be shut down ( #858 )
5 years ago
Ozzieisaacs
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
5 years ago
Ozzieisaacs
05da2ae3c7
Update search for cyrillic letters
5 years ago
Ozzieisaacs
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
5 years ago
Ozzieisaacs
55bdd13fb1
Fix #877
5 years ago
Ozzieisaacs
4552208c02
Fix #848
5 years ago
Ozzieisaacs
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
5 years ago
Ozzieisaacs
a669eacde9
Merge remote-tracking branch 'proxy/patch-1'
5 years ago
Ozzieisaacs
2253708da7
Merge remote-tracking branch 'proxy/patch-1' into Develop
5 years ago
Ozzieisaacs
51e591bd25
Added updated translation
5 years ago
Ozzieisaacs
5188c62bea
Merge remote-tracking branch 'translation/loc-hu'
5 years ago
Ozzieisaacs
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
5 years ago
Ozzieisaacs
e754ce313c
Merge remote-tracking branch 'pycountry/pycountry'
5 years ago
Ozzieisaacs
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
5 years ago
Barnabás Nagy
afc79416b2
HU Translation updates
...
Translation of the new untranslated strings
5 years ago
Josh Max
cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
...
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
5 years ago
Iris Wildthyme
cbdc9876b2
comicapi dependency now pippable
5 years ago
Iris Wildthyme
05d0f12608
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
5 years ago
Daniel Pavel
858c80bb20
'except' style fix
5 years ago
Daniel Pavel
f7e640fd98
support pycountry if iso-639 is not available
5 years ago
Daniel Pavel
439ce19b5d
Updated epub.js to v0.3.66
5 years ago
Ozzieisaacs
1c9ff6421d
Fix uploader
5 years ago
Ozzieisaacs
4b301a7961
Additional fix for #845 (in case of error)
5 years ago
Ozzieisaacs
dc93222579
Update 2 column author list view
5 years ago
Yijun Zhao
6c493df2f5
support issue: #843
5 years ago
Ozzieisaacs
772f978b45
Improved code quality
5 years ago
Ozzieisaacs
0f1db18eae
Simplified typeahead
5 years ago
Ozzieisaacs
6940bb9b88
Code improvement
5 years ago
Ozzieisaacs
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
5 years ago
Ozzieisaacs
39a3f70084
Fix for slow updater
5 years ago
Ozzieisaacs
8923e71220
Remove debug logging
5 years ago
Ozzieisaacs
843a93fe28
Updater fix for slow servers
5 years ago
OzzieIsaacs
fa36072699
Fix uk translation-file
5 years ago
OzzieIsaacs
8ab9365688
Prevent error 500 for cover of not exisiting book
5 years ago
Chad Bergeron
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
5 years ago
Elifcan Cakmak
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
5 years ago
tomjmul
8e8486497f
Restirct a user to a set of tags
5 years ago
Ozzieisaacs
e5593d9a7f
Integrated author in sorting functions
5 years ago
Ozzieisaacs
3f2a9c8bae
Code improvement
5 years ago
Ozzieisaacs
7c69589c5b
Code cosmetics unrar.js
5 years ago
Ozzieisaacs
149e9b4bd4
Code cosmetis unrar
5 years ago
Ozzieisaacs
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
5 years ago
Ozzieisaacs
765b817384
Refactored shelf.py and editbooks.py
5 years ago
Ozzieisaacs
baf83b2f5a
Refactored generating download links
5 years ago
Ozzieisaacs
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
5 years ago
Ozzieisaacs
a66873a9e2
Added file formats view
6 years ago
Ozzieisaacs
a0a15b4598
Fix max authors shown
6 years ago
Ozzieisaacs
4a33278596
Update ratings
6 years ago
Ozzieisaacs
6d2270d931
Fixes for Oauth
6 years ago
Ozzieisaacs
1db1c2e7df
Enabling LDAP working again
...
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
6 years ago
Ozzieisaacs
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
6 years ago
Ozzieisaacs
76d40411dd
Translation updated
6 years ago
Ozzieisaacs
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
Ozzieisaacs
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
6 years ago
Ozzieisaacs
6f80a63ca6
Fix for #827
6 years ago
Andrew Sullivan
3dfc2f2580
fixing issue #833
6 years ago
Ozzieisaacs
5b0a0e2139
Fix #835
6 years ago
Ozzieisaacs
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
Ozzieisaacs
6f0b3bbda0
Fix for #812
6 years ago
Ozzieisaacs
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
Ozzieisaacs
1561a4abdf
Comic improvments
6 years ago
Ozzieisaacs
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
Ozzieisaacs
466af21548
Code Cosmetics
6 years ago
Ozzieisaacs
0224d45961
Code cosmetics
6 years ago
Ozzieisaacs
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
Ozzieisaacs
6269a83c3d
Fix mismerge user logon with python3 in opds feed
6 years ago
Ozzieisaacs
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
Ozzieisaacs
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
Ozzieisaacs
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
Ozzieisaacs
fda977b155
Fix for users with umlauts
6 years ago
Ozzieisaacs
68a36597ab
Fix opds login on python3
6 years ago
Ozzieisaacs
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
Ozzieisaacs
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
jianyun.zhao
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
Ozzieisaacs
361a1243d7
Improvements #828
6 years ago
Ozzieisaacs
246d7673a9
Corrected file header with copyright information
6 years ago
Virgil Grigoras
bd7b0175a1
Fix remaining shown by codacy
6 years ago
Virgil Grigoras
f5cf62f209
Fix issues shown by codacy
6 years ago
Virgil Grigoras
15aa49e163
shorten authors in author / discover / index / search and shelf
6 years ago
Virgil Grigoras
3272b4ca1e
configuration field for max_authors
6 years ago
Virgil Grigoras
d3ed0317bb
styling and javascript for hiding authors
6 years ago
Virgil Grigoras
e5bc1ae020
Add new database field for storing max_authors
6 years ago
Ozzieisaacs
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
6 years ago
Ozzieisaacs
fad62a0909
translation update
6 years ago
Ozzieisaacs
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
Ozzieisaacs
1de3929988
Unicode
6 years ago
Ozzieisaacs
cc3088c52f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
6 years ago
Ozzieisaacs
0facb8fffa
Fix #766
6 years ago
Ozzieisaacs
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 years ago
AngelByDay
38307ececb
Force namespace resolution of imports
...
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
6 years ago
Ozzieisaacs
17b7333992
Merge remote-tracking branch 'caliblur/master'
6 years ago
leram84
ae279c5123
fixed description read-more button
6 years ago
Ozzieisaacs
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
Ozzieisaacs
ae7c4908f9
Fix #767
6 years ago
Ozzieisaacs
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
hexeth
9a0e8fefb7
re-add loader code
6 years ago
Matt
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
6 years ago
hexeth
5a863541de
Fix object object
6 years ago
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
Ozzieisaacs
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
Fabian Wüthrich
7fb9bf8889
Truncate single quote in upload file name
6 years ago
Ozzieisaacs
3d5d95904a
Oauth working somehow (?)
6 years ago
Ozzieisaacs
a0be02e687
Ldap working
6 years ago
Ozzieisaacs
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
6 years ago
Ozzieisaacs
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
Ozzieisaacs
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
Ozzieisaacs
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 years ago
Ozzieisaacs
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
6 years ago
lorek123
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
Ozzieisaacs
c1ef1bcd19
User and admin pages are working again
6 years ago
Ozzieisaacs
1fc4bc5204
Fix routes
...
Fix error page
6 years ago
Ozzieisaacs
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs
d58d792f56
Catch Imagemagick policy error
6 years ago
Ozzieisaacs
d6ee8f75e9
More refactoring
6 years ago
Ozzieisaacs
a00d93a2d9
Working again (basically)
6 years ago
Ozzieisaacs
561d40f8ff
Merge branch 'master' into Develop
6 years ago
Ozzieisaacs
6fc4b318e8
cover folders beautified
6 years ago
Ozzieisaacs
36229076f7
Refactor subprocess calls
6 years ago
Ozzieisaacs
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
6 years ago
Ozzieisaacs
ea98323c06
Fixes Google Drive
...
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
6 years ago
Ozzieisaacs
b75b91606c
Fix config oauth-UI
6 years ago
Ozzieisaacs
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
Ozzieisaacs
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
Ozzieisaacs
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
6 years ago
Ozzieisaacs
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 years ago
Ozzieisaacs
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
6 years ago
Ozzieisaacs
9128615f48
Fix #424
...
Fix #425
6 years ago
Ozzieisaacs
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
6 years ago
Ozzieisaacs
97064db2a4
Restart python3 fix, stop and restart python2 working again
6 years ago
Ozzieisaacs
341dd77b9d
Bugfix Restart and Stop server on python3
6 years ago
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
Ozzieisaacs
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
Ozzieisaacs
62574939b2
Fix #770
6 years ago
Matt
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49b
, reversing
changes made to ae55dd6c27
.
6 years ago
hexeth
3ba9e4d96e
reader theme
6 years ago
leram84
ae55dd6c27
Update caliBlur.min.css
6 years ago
Matt
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
.
6 years ago
Matt
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
.
6 years ago
Matt
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
.
6 years ago
Matt
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
.
6 years ago
hexeth
6a2ebba85b
Not ready for commit
6 years ago
hexeth
7e9d6a3cf9
Add Dark-Reader
6 years ago
leram84
a69e43922a
Create dark-reader.css
6 years ago
leram84
df8806e182
Update caliBlur.min.css
6 years ago
hexeth
83a905bfe1
Don't remove the dropdown toggle
6 years ago
Matt
e01872fc79
Revert "Update caliBlur.min.css"
...
This reverts commit 2b7b55846b
.
6 years ago
leram84
2b7b55846b
Update caliBlur.min.css
6 years ago
hexeth
c0792b7225
Add .sendtokindle-drop to click-off
6 years ago
Matt
8825352af6
Revert "Add sendtokindle-drop to click-off array"
...
This reverts commit d83ba315f0
.
6 years ago
hexeth
d83ba315f0
Add sendtokindle-drop to click-off array
6 years ago
hexeth
16e23cb1fe
Fix upload tooltip not appearing
6 years ago
leram84
df2b1ba09d
fix for send button dropdown
6 years ago
hexeth
9a12e60b1c
Toggle for dropdown
6 years ago
hexeth
c620453ebf
UL positioning
6 years ago
hexeth
4988e3b631
add tooltip and move UL higher in DOM
6 years ago
Matt
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
.
6 years ago
Ozzie Isaacs
9e5fa45df7
Removed unnecessary wait message
6 years ago
leram84
d5ff3b6a0b
smtp setup page ( #774 )
...
fix for https://github.com/janeczku/calibre-web/issues/773
6 years ago
Ozzie Isaacs
cc618ecee7
Fix Limiting domains (related to #773 )
6 years ago
Ozzieisaacs
f4977c3767
Merge remote-tracking branch 'theme/master'
6 years ago
hexeth
a9277da85a
Update ID of button from sendbtn2 to sendbtn
...
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
6 years ago
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
Krakinou
d48cdcc789
Correct authentication in case LDAP not activated
6 years ago
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
6 years ago
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
6 years ago
Krakinou
aafb267787
Merge branch 'master' into master
6 years ago
Krakinou
2e37c14d94
Clean some comment
6 years ago
Krakinou
91f0908059
insert into db
...
connect via LDAP config
6 years ago
Krakinou
8d284b151d
Edit html config
6 years ago
Ozzieisaacs
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
6 years ago
hexeth
4ace3a5e27
test
6 years ago
leram84
db83fb3bd7
minified
6 years ago
hexeth
883633a045
Remove beta from caliBlur selection
6 years ago
Matt
84fdf9143b
Revert "Update web.py"
...
This reverts commit a388f03b99
.
6 years ago
Matt
7a069ad72e
Revert "Update web.py"
...
This reverts commit 1bcc0698d5
.
6 years ago
leram84
f897491070
Update caliBlur.min.css
6 years ago
Ozzieisaacs
f053508013
Fix #764
6 years ago
hexeth
2ab10bb070
Update caliBlur.js
6 years ago
hexeth
1bcc0698d5
Update web.py
6 years ago
hexeth
a388f03b99
Update web.py
6 years ago
hexeth
9c75eb7016
Update caliBlur.js
6 years ago
hexeth
6c37aafae9
Update caliBlur.js
6 years ago
hexeth
550262e651
Further fix
6 years ago
hexeth
edb4cedc65
Update about page to target new body class
6 years ago
hexeth
40e45c7272
Add files via upload
6 years ago
hexeth
7032f311d5
Update caliBlur.js
6 years ago
Ozzieisaacs
66fcd71685
Merge remote-tracking branch 'origin/master'
6 years ago
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
6 years ago
Krakinou
30954cc27f
Initial LDAP support
6 years ago
hexeth
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
6 years ago
Ozzieisaacs
d5a913e195
Merge remote-tracking branch 'origin/master'
6 years ago
leram84
dba5680121
1.0 for the merge ( #758 )
...
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
6 years ago
Ozzieisaacs
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
6 years ago
hexeth
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
6 years ago
hexeth
418e98d1f8
update .published-date to .publishing-date ( #756 )
6 years ago
Ozzieisaacs
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
Ozzieisaacs
fa3426aa08
Merge remote-tracking branch 'origin/master'
6 years ago
hexeth
eb1c87fbae
Patch 4 ( #752 )
...
* Target new class
Target new class for caliblur language support
* Move publishing date into div
Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.
* Target newly created div
6 years ago
hexeth
c77825371d
Add classes to shelves for easier css selection ( #751 )
...
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
6 years ago
Ozzieisaacs
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
6 years ago
Ozzieisaacs
8db2b62b39
Merge remote-tracking branch 'origin/master'
6 years ago
Ozzieisaacs
98134616b6
Fix #661 (authors are shown according to the authors sort order)
6 years ago
Ozzieisaacs
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
6 years ago
hexeth
29c9d55498
Remove leading space in span ( #749 )
...
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
6 years ago
hexeth
ece11de942
Fix publisher not formatting correct ( #747 )
6 years ago
Ozzieisaacs
f821580b50
#Fix 745
6 years ago
Ozzieisaacs
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
6 years ago
Ozzieisaacs
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
6 years ago
Adrian Petrescu
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
6 years ago
Ozzieisaacs
9cfe1dce20
Fix #739
6 years ago
Ozzieisaacs
cb0f3cd074
Fix #696
6 years ago
Ozzieisaacs
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
grunjol
462cf20a34
Process all custom columns on editing
6 years ago
grunjol
00ba231fbf
fix adding an existing language to a book
6 years ago
Ozzieisaacs
677264950d
Merge remote-tracking branch 'ru-translation/master'
6 years ago
Anton Konyshev
e6b1c8cf36
Updated Russian translation
6 years ago
Ozzieisaacs
9057a3a0d7
Merge remote-tracking branch 'dutchtranslation/master'
6 years ago
Ed Driesen
45d97d277a
Update Dutch translation
...
Some lines where still untranslated, fixed it.
6 years ago
Ozzieisaacs
81e3afbcc4
Fix #714 (advanced search for ratings)
6 years ago
Ozzieisaacs
7526b0dcb4
Fix #623 , #715
6 years ago
Ozzieisaacs
64b1b830d6
Fix #712
6 years ago
Ozzieisaacs
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
Ozzieisaacs
b78130e3b1
Merge remote-tracking branch '681/681-fix'
6 years ago
Ozzieisaacs
47424e5c1a
Merge remote-tracking branch 'swedish/master'
...
Improved server stop command
6 years ago
Jony
bc0d19f33d
Fix typo
6 years ago
Jony
cbc9169973
Update messages.po
6 years ago
haseo
e1b6fa25e9
A better solution to #681
6 years ago
Ozzieisaacs
dfa17956c9
Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
...
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
Ozzieisaacs
a2b612c9ab
Merge remote-tracking branch 'ssl/verify-ssl-paths'
6 years ago
Ozzieisaacs
2422f782de
Fix #701
6 years ago
Ozzieisaacs
c574b779fb
Added swedish translation
6 years ago
Ozzieisaacs
07d7be176c
Merge remote-tracking branch 'lang/master'
6 years ago
André Santos
c6a5ac7f25
Fix wrong variable usage
6 years ago
André Santos
af216e3697
Verify if certfile and keyfile are paths to actual files
...
This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.
6 years ago
dalin
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
6 years ago
Ozzieisaacs
399dffba5a
log file name in case of filename not found ( #691 )
6 years ago
Ozzieisaacs
8d6d28eb57
Merge remote-tracking branch 'titlelink/titles-links'
...
Fix for #694
6 years ago
Ozzieisaacs
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
Ozzieisaacs
38c180a9ea
Update translation files
6 years ago
Ozzieisaacs
c05687b896
Fix #668
6 years ago
Ozzieisaacs
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
Ozzieisaacs
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
Ozzieisaacs
0df35dcfea
Update Updater
6 years ago
Ozzieisaacs
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
Ozzieisaacs
c1818e8f36
Fix for #672
6 years ago
Ozzieisaacs
ee85492c7d
Fix #662
6 years ago
Ozzieisaacs
5fc742c9c4
Fix #690
6 years ago
Ozzieisaacs
3f83be00fd
Fix #687
6 years ago
Ozzieisaacs
6ec9bc9e5c
Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
...
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
Ozzieisaacs
e080c74032
Merge remote-tracking branch 'ru-translation/patch-2'
6 years ago
OzzieIsaacs
58df19972f
Merge remote-tracking branch 'hungarian/loc-hu'
...
Update spanish language
6 years ago
Jim Ma
4b76b8400d
Add OAuth link&unlink in user profile
6 years ago
Jim Ma
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
otapi
9b4ca22254
Update shelf.html
6 years ago
otapi
c6d3613e57
Add UI link button to shelves
6 years ago
otapi
1201d4086f
Few termchanges
6 years ago
otapi
e0229c917c
Download only shelf
...
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
6 years ago
Chintogtokh Batbold
13883db5a0
Add anchor tags to titles
6 years ago
otapi
922e21438c
Minor fix
6 years ago
otapi
32366ab1ba
HU translation fixes
6 years ago
otapi
62d172f1e0
Delete dummy
6 years ago
otapi
67ecc2c088
HU translation
6 years ago
otapi
81a3b85c07
Create dummy
6 years ago
Victorhck
c09b7f39a5
spanish translation finished
6 years ago
Victorhck
b32ee84d4f
update Spanish translation (WIP
6 years ago
bodybybuddha
ee686b5379
Fix for #617
...
Task table: Status column and task messages have been localized
Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
6 years ago
Ozzie Isaacs
7253f583cf
Fix #650
...
Improved testablility
Added feedback for book_edit -> stay on edit page
6 years ago
bodybybuddha
54f8680058
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
OzzieIsaacs
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
6 years ago
bodybybuddha
d8107fb50f
Addressed Codacy trailing space items ... again
6 years ago
bodybybuddha
46b2c9919a
Fix for #295
...
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
6 years ago
bodybybuddha
1144d97bc1
Fixed updating new book format to be all caps in database
...
This keeps us inline with calibre's behavior.
6 years ago
bodybybuddha
5d34fd7fec
Send to Kindle button precheck added
...
Based on existing book formats and which converter (if any) determine if button can be seen.
6 years ago
Virgil Grigoras
a798dc94a9
Satisfy "Codacy/PR Quality Review"
6 years ago
Virgil Grigoras
60e9d01d27
Beautify http errors
6 years ago
Virgil Grigoras
1ac9b3d837
Update OPDS-part to display publishers
6 years ago
Virgil Grigoras
6a007ec881
fix indentations
6 years ago
Virgil Grigoras
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
bodybybuddha
1b363ac720
Merged master into 617 - fixed import copy conflict
6 years ago
Virgil Grigoras
016c7b4b1c
Add ability to store and edit publishers
6 years ago
OzzieIsaacs
5a2ed58d06
Improved message for non configured ebook converter
...
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
6 years ago
OzzieIsaacs
ffe3dd3de3
Show version of Werkzeug and Jinja2 in stats page
6 years ago
bodybybuddha
a7386ecb8b
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
bodybybuddha
9b1954f2f0
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
Ozzie Isaacs
c36b1ed58a
Added additional ids and classes for easier testing
6 years ago
Ozzie Isaacs
cd0fc917d7
Bugfix template rights at creating user
...
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
bodybybuddha
29efcf8358
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
bodybybuddha
d2e74a27cd
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
OzzieIsaacs
ba7c734657
Fixes from testing:
...
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
6 years ago
OzzieIsaacs
cab98a9165
Update translation files
6 years ago
OzzieIsaacs
aa5127cd16
Merge remote-tracking branch 'lxml/master'
6 years ago
OzzieIsaacs
b841baf714
Comment for adding publishers
6 years ago
eddriesen
522e897fee
Updated Dutch translation to current codebase
...
As requested,
A Dutch update
6 years ago
Fatih Ka
76e3be58e6
Delete book fixed
...
There was an incorrect parameter.
6 years ago
bodybybuddha
b4122e9858
Partial fix to #617 . Local status messages now work.
6 years ago
trasba
3fa41d0e4a
added formats for upload and conversion
...
added formats for upload and conversion (html, rtf, odt)
6 years ago
bodybybuddha
be0ddf25e4
Fix for #621 - Login page always in english
6 years ago
OzzieIsaacs
80e1a6910d
Fix Updater
6 years ago
OzzieIsaacs
b5ef63d327
Removed fixed update Informations
6 years ago
OzzieIsaacs
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
6 years ago
OzzieIsaacs
36d26f2089
Merge remote-tracking branch '625/625'
...
Update russian translation
6 years ago
bodybybuddha
03dc179bc3
Fixed Codacy Issues
6 years ago
bodybybuddha
89c0904ac9
Fix to #625 - Check to see if target book format already exists before executing conversion.
6 years ago
Admiral Laser Beard
21582f097e
update translation
6 years ago
OzzieIsaacs
968cddf2b0
Fix for #620
6 years ago
Virgil Grigoras
e08eccba5a
Satisfy "Codacy/PR Quality Review"
6 years ago
Virgil Grigoras
50ded1afc1
typo fix
6 years ago
Virgil Grigoras
b2b092c190
Bugfix for not displaying information when there is no update available + simplification
6 years ago
Virgil Grigoras
f7872aded0
Own function for getting the current commit hash and datetime
6 years ago
Virgil Grigoras
cb5adb3a31
Display "what's new" information for newer versions than the current one
6 years ago
OzzieIsaacs
01fb8ee681
Fix #609
...
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
6 years ago
Virgil Grigoras
9616562a76
Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block)
6 years ago
Virgil Grigoras
cfae6e893a
Move update relevant parts to own section
6 years ago
Virgil Grigoras
1047859424
Place general information (db location, amount of books...) on top
6 years ago
Virgil Grigoras
354eac1512
fix html errors and formating
6 years ago
Virgil Grigoras
6e2dbb7cd6
move current commit hash to its own file
6 years ago
Virgil Grigoras
f477d48c7c
More robust handling while checking for new updates
6 years ago
OzzieIsaacs
bb7d2c6273
Update Language translation table (now including the locale language)
...
Fix #602
Fix for #593
6 years ago
OzzieIsaacs
79ee07ea54
Fix for python3 and pickle
6 years ago
OzzieIsaacs
ce6cde545b
Update french language
6 years ago