9a5ab97d78
Merge branch 'master' into master
5 years ago
79286c9384
encode password
5 years ago
c4e3f3670f
Added public /reconnect endpoint
5 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
97d12b94f6
Correct settings update
5 years ago
e4d801bbaf
initial flask_simpleldap implementation
5 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
5 years ago
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
5 years ago
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
f70c839014
Added additional permission viewer
5 years ago
0c80f5c63a
Update Teststatus
5 years ago
1030e195a5
Fix #916
5 years ago
3b03aa30a6
Fix for advanced search
5 years ago
cb0403a924
Merge remote-tracking branch 'adv_search/master'
5 years ago
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
55bb8d4590
Fix #900
5 years ago
b80bfa5260
Improvement for #897
5 years ago
f941908f73
Workaround for #889
5 years ago
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
5 years ago
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
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
5 years ago
c748716ad2
Fix for opds feed of unread/read books
5 years ago
544405f5aa
Update search for cyrillic letters #877
5 years ago
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
5 years ago
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
5 years ago
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
5 years ago
55bdd13fb1
Fix #877
5 years ago
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
5 years ago
f7e640fd98
support pycountry if iso-639 is not available
5 years ago
4b301a7961
Additional fix for #845 (in case of error)
5 years ago
772f978b45
Improved code quality
5 years ago
0f1db18eae
Simplified typeahead
5 years ago
6940bb9b88
Code improvement
5 years ago
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
5 years ago
8923e71220
Remove debug logging
5 years ago
843a93fe28
Updater fix for slow servers
5 years ago
8ab9365688
Prevent error 500 for cover of not exisiting book
5 years ago
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
5 years ago
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
5 years ago
8e8486497f
Restirct a user to a set of tags
5 years ago
e5593d9a7f
Integrated author in sorting functions
5 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
5 years ago
baf83b2f5a
Refactored generating download links
5 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
5 years ago
a66873a9e2
Added file formats view
5 years ago
a0a15b4598
Fix max authors shown
5 years ago
4a33278596
Update ratings
5 years ago
6d2270d931
Fixes for Oauth
5 years ago
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
5 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
5 years ago
5b0a0e2139
Fix #835
5 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
5 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
5 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
0be17ed157
Refactored sidebar (some parts are missing)
5 years ago
6269a83c3d
Fix mismerge user logon with python3 in opds feed
5 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
5 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
5 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
5 years ago
fda977b155
Fix for users with umlauts
5 years ago
68a36597ab
Fix opds login on python3
5 years ago
361a1243d7
Improvements #828
5 years ago
e5bc1ae020
Add new database field for storing max_authors
5 years ago
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
5 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
5 years ago
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
5 years ago
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
5 years ago
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.
5 years ago
ae7c4908f9
Fix #767
5 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
5 years ago
3d5d95904a
Oauth working somehow (?)
5 years ago
a0be02e687
Ldap working
5 years ago
56826f67fc
progressbar during upload thanks to jim3ma
5 years ago
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
5 years ago
c1ef1bcd19
User and admin pages are working again
5 years ago
1fc4bc5204
Fix routes
...
Fix error page
5 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
d6ee8f75e9
More refactoring
5 years ago
a00d93a2d9
Working again (basically)
5 years ago
561d40f8ff
Merge branch 'master' into Develop
5 years ago
6fc4b318e8
cover folders beautified
5 years ago
36229076f7
Refactor subprocess calls
5 years ago
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
5 years ago
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
5 years ago
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
5 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
5 years ago
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
5 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
5 years ago
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
5 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
5 years ago
97064db2a4
Restart python3 fix, stop and restart python2 working again
5 years ago
341dd77b9d
Bugfix Restart and Stop server on python3
5 years ago
836c6fd245
Updated translations
...
Added license texts in flies
5 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
5 years ago
62574939b2
Fix #770
5 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
5 years ago
d48cdcc789
Correct authentication in case LDAP not activated
5 years ago
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
5 years ago
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
5 years ago
aafb267787
Merge branch 'master' into master
5 years ago
2e37c14d94
Clean some comment
5 years ago
91f0908059
insert into db
...
connect via LDAP config
5 years ago
f053508013
Fix #764
5 years ago
36030b559c
Choosing Theme is now a global setting
5 years ago
30954cc27f
Initial LDAP support
5 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
5 years ago
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
5 years ago
98134616b6
Fix #661 (authors are shown according to the authors sort order)
5 years ago
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
5 years ago
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
5 years ago
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
5 years ago
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.
5 years ago
9cfe1dce20
Fix #739
5 years ago
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
5 years ago
462cf20a34
Process all custom columns on editing
5 years ago
00ba231fbf
fix adding an existing language to a book
5 years ago
81e3afbcc4
Fix #714 (advanced search for ratings)
6 years ago
7526b0dcb4
Fix #623 , #715
6 years ago
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
b78130e3b1
Merge remote-tracking branch '681/681-fix'
6 years ago
e1b6fa25e9
A better solution to #681
6 years ago
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
2422f782de
Fix #701
6 years ago
07d7be176c
Merge remote-tracking branch 'lang/master'
6 years ago
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
6 years ago
399dffba5a
log file name in case of filename not found ( #691 )
6 years ago
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
0df35dcfea
Update Updater
6 years ago
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
ee85492c7d
Fix #662
6 years ago
3f83be00fd
Fix #687
6 years ago
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
4b76b8400d
Add OAuth link&unlink in user profile
6 years ago
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
c6d3613e57
Add UI link button to shelves
6 years ago
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
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
7253f583cf
Fix #650
...
Improved testablility
Added feedback for book_edit -> stay on edit page
6 years ago
54f8680058
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
6 years ago
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
a798dc94a9
Satisfy "Codacy/PR Quality Review"
6 years ago
60e9d01d27
Beautify http errors
6 years ago
1ac9b3d837
Update OPDS-part to display publishers
6 years ago
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
1b363ac720
Merged master into 617 - fixed import copy conflict
6 years ago
016c7b4b1c
Add ability to store and edit publishers
6 years ago
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
ffe3dd3de3
Show version of Werkzeug and Jinja2 in stats page
6 years ago
a7386ecb8b
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
9b1954f2f0
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
cd0fc917d7
Bugfix template rights at creating user
...
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
29efcf8358
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
d2e74a27cd
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
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
aa5127cd16
Merge remote-tracking branch 'lxml/master'
6 years ago
b841baf714
Comment for adding publishers
6 years ago
76e3be58e6
Delete book fixed
...
There was an incorrect parameter.
6 years ago
b4122e9858
Partial fix to #617 . Local status messages now work.
6 years ago
3fa41d0e4a
added formats for upload and conversion
...
added formats for upload and conversion (html, rtf, odt)
6 years ago
be0ddf25e4
Fix for #621 - Login page always in english
6 years ago
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
6 years ago
968cddf2b0
Fix for #620
6 years ago
e08eccba5a
Satisfy "Codacy/PR Quality Review"
6 years ago
50ded1afc1
typo fix
6 years ago
b2b092c190
Bugfix for not displaying information when there is no update available + simplification
6 years ago
f7872aded0
Own function for getting the current commit hash and datetime
6 years ago
cb5adb3a31
Display "what's new" information for newer versions than the current one
6 years ago
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
6e2dbb7cd6
move current commit hash to its own file
6 years ago
f477d48c7c
More robust handling while checking for new updates
6 years ago
bb7d2c6273
Update Language translation table (now including the locale language)
...
Fix #602
Fix for #593
6 years ago
79ee07ea54
Fix for python3 and pickle
6 years ago
ce6cde545b
Update french language
6 years ago
919de60e8d
Final fix #615
6 years ago
a5d15a19de
Update Translation "->'
6 years ago
2de41a5c86
improvement for #615
6 years ago
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
6 years ago
0091006aad
Fix #611
...
Fix for #615
6 years ago
0bcb20f674
Fix #604
...
Added missing translation for "select option"
6 years ago
0e1711631c
Fix for #600
...
publisher-info is shown on edit page (#599 )
6 years ago
66824ff4e4
Fix #576
6 years ago
06ffa5e66d
Fix displaying random books with no author entry
...
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
6 years ago
4a95404e17
Merge remote-tracking branch 'Convert_all/ebookconvert-any'
...
# Conflicts:
# cps/web.py
6 years ago
3f35200a0b
Merge remote-tracking branch 'Comic/comic_server'
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive.js
# cps/static/js/io.js
# cps/static/js/kthoom.js
# cps/static/js/unrar.js
# cps/static/js/untar.js
# cps/static/js/unzip.js
# cps/templates/config_edit.html
# cps/templates/detail.html
# cps/templates/readcbr.html
# cps/templates/stats.html
# cps/ub.py
# cps/web.py
# optional-requirements.txt
6 years ago
9c889d1681
Fix #597
...
Updated language files
6 years ago
22ecdfd2bc
Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button
6 years ago
4b006fba99
Re-commit: #584 & #587 Convert any book format to another format
6 years ago
fc78d1ee07
Added exception catching for file format check
6 years ago
4f386c8a00
Updated GUI buttons for ebook-convert feature
6 years ago
3ec000ad85
Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any
6 years ago
a7a91ae54c
Added posibility to upload cover from local drive ( #439 )
...
Updated language files
6 years ago
3a37183e25
Included khmer language
...
Further unified naming
6 years ago
2453786174
Limit registering domains
6 years ago
e160efbdac
Add GUI functions for ebookconvert any format feature
6 years ago
cedc183987
Fix #590 , #589 .
...
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
6 years ago
5889535355
Bugfix gdrive download Books
...
Bugfix pagination
Fix Error messages massadd of books to shelf
6 years ago
d414bf3263
Massadd of books to shelfs ( #203 , #404 ) from advanced search
...
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
Krakinou