5188c62bea
Merge remote-tracking branch 'translation/loc-hu'
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
e754ce313c
Merge remote-tracking branch 'pycountry/pycountry'
5 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
5 years ago
afc79416b2
HU Translation updates
...
Translation of the new untranslated strings
5 years ago
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
cbdc9876b2
comicapi dependency now pippable
5 years ago
05d0f12608
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
5 years ago
858c80bb20
'except' style fix
5 years ago
f7e640fd98
support pycountry if iso-639 is not available
5 years ago
439ce19b5d
Updated epub.js to v0.3.66
5 years ago
1c9ff6421d
Fix uploader
5 years ago
4b301a7961
Additional fix for #845 (in case of error)
5 years ago
dc93222579
Update 2 column author list view
5 years ago
6c493df2f5
support issue: #843
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
39a3f70084
Fix for slow updater
5 years ago
8923e71220
Remove debug logging
5 years ago
843a93fe28
Updater fix for slow servers
5 years ago
fa36072699
Fix uk translation-file
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
e5593d9a7f
Integrated author in sorting functions
5 years ago
3f2a9c8bae
Code improvement
5 years ago
7c69589c5b
Code cosmetics unrar.js
5 years ago
149e9b4bd4
Code cosmetis unrar
5 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
5 years ago
765b817384
Refactored shelf.py and editbooks.py
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
1db1c2e7df
Enabling LDAP working again
...
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
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
76d40411dd
Translation updated
5 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
5 years ago
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
5 years ago
6f80a63ca6
Fix for #827
5 years ago
3dfc2f2580
fixing issue #833
5 years ago
5b0a0e2139
Fix #835
5 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
5 years ago
6f0b3bbda0
Fix for #812
5 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
5 years ago
1561a4abdf
Comic improvments
5 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
466af21548
Code Cosmetics
5 years ago
0224d45961
Code cosmetics
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
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
5 years ago
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
5 years ago
54a006a420
[fix] Add a scroll bar to a long list of meta information
5 years ago
361a1243d7
Improvements #828
5 years ago
246d7673a9
Corrected file header with copyright information
5 years ago
bd7b0175a1
Fix remaining shown by codacy
5 years ago
f5cf62f209
Fix issues shown by codacy
5 years ago
15aa49e163
shorten authors in author / discover / index / search and shelf
5 years ago
3272b4ca1e
configuration field for max_authors
5 years ago
d3ed0317bb
styling and javascript for hiding authors
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
fad62a0909
translation update
5 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
5 years ago
1de3929988
Unicode
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
0facb8fffa
Fix #766
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
17b7333992
Merge remote-tracking branch 'caliblur/master'
5 years ago
ae279c5123
fixed description read-more button
5 years ago
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
5 years ago
ae7c4908f9
Fix #767
5 years ago
ea1a882353
Merge remote-tracking branch 'origin/master'
5 years ago
9a0e8fefb7
re-add loader code
5 years ago
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
5 years ago
5a863541de
Fix object object
5 years ago
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
5 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
5 years ago
7fb9bf8889
Truncate single quote in upload file name
5 years ago
3d5d95904a
Oauth working somehow (?)
5 years ago
a0be02e687
Ldap working
5 years ago
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
5 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
5 years ago
56826f67fc
progressbar during upload thanks to jim3ma
5 years ago
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
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
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
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
d58d792f56
Catch Imagemagick policy error
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
b75b91606c
Fix config oauth-UI
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
6 years ago
9128615f48
Fix #424
...
Fix #425
6 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
6 years ago
97064db2a4
Restart python3 fix, stop and restart python2 working again
6 years ago
341dd77b9d
Bugfix Restart and Stop server on python3
6 years ago
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
62574939b2
Fix #770
6 years ago
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49bae55dd6c27
6 years ago
3ba9e4d96e
reader theme
6 years ago
ae55dd6c27
Update caliBlur.min.css
6 years ago
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
6 years ago
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
6 years ago
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
6 years ago
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
6 years ago
6a2ebba85b
Not ready for commit
6 years ago
7e9d6a3cf9
Add Dark-Reader
6 years ago
a69e43922a
Create dark-reader.css
6 years ago
df8806e182
Update caliBlur.min.css
6 years ago
83a905bfe1
Don't remove the dropdown toggle
6 years ago
e01872fc79
Revert "Update caliBlur.min.css"
...
This reverts commit 2b7b55846b
6 years ago
2b7b55846b
Update caliBlur.min.css
6 years ago
c0792b7225
Add .sendtokindle-drop to click-off
6 years ago
8825352af6
Revert "Add sendtokindle-drop to click-off array"
...
This reverts commit d83ba315f0
6 years ago
d83ba315f0
Add sendtokindle-drop to click-off array
6 years ago
16e23cb1fe
Fix upload tooltip not appearing
6 years ago
df2b1ba09d
fix for send button dropdown
6 years ago
9a12e60b1c
Toggle for dropdown
6 years ago
c620453ebf
UL positioning
6 years ago
4988e3b631
add tooltip and move UL higher in DOM
6 years ago
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
6 years ago
9e5fa45df7
Removed unnecessary wait message
6 years ago
d5ff3b6a0b
smtp setup page ( #774 )
...
fix for https://github.com/janeczku/calibre-web/issues/773
6 years ago
cc618ecee7
Fix Limiting domains (related to #773 )
6 years ago
f4977c3767
Merge remote-tracking branch 'theme/master'
6 years ago
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
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
d48cdcc789
Correct authentication in case LDAP not activated
6 years ago
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
6 years ago
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
6 years ago
aafb267787
Merge branch 'master' into master
6 years ago
2e37c14d94
Clean some comment
6 years ago
91f0908059
insert into db
...
connect via LDAP config
6 years ago
8d284b151d
Edit html config
6 years ago
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
6 years ago
4ace3a5e27
test
6 years ago
db83fb3bd7
minified
6 years ago
883633a045
Remove beta from caliBlur selection
6 years ago
84fdf9143b
Revert "Update web.py"
...
This reverts commit a388f03b99
6 years ago
7a069ad72e
Revert "Update web.py"
...
This reverts commit 1bcc0698d5
6 years ago
f897491070
Update caliBlur.min.css
6 years ago
f053508013
Fix #764
6 years ago
2ab10bb070
Update caliBlur.js
6 years ago
1bcc0698d5
Update web.py
6 years ago
a388f03b99
Update web.py
6 years ago
9c75eb7016
Update caliBlur.js
6 years ago
6c37aafae9
Update caliBlur.js
6 years ago
550262e651
Further fix
6 years ago
edb4cedc65
Update about page to target new body class
6 years ago
40e45c7272
Add files via upload
6 years ago
7032f311d5
Update caliBlur.js
6 years ago
66fcd71685
Merge remote-tracking branch 'origin/master'
6 years ago
36030b559c
Choosing Theme is now a global setting
6 years ago
30954cc27f
Initial LDAP support
6 years ago
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
6 years ago
d5a913e195
Merge remote-tracking branch 'origin/master'
6 years ago
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
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
6 years ago
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
6 years ago
418e98d1f8
update .published-date to .publishing-date ( #756 )
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
fa3426aa08
Merge remote-tracking branch 'origin/master'
6 years ago
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
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
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
6 years ago
8db2b62b39
Merge remote-tracking branch 'origin/master'
6 years ago
98134616b6
Fix #661 (authors are shown according to the authors sort order)
6 years ago
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
6 years ago
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
ece11de942
Fix publisher not formatting correct ( #747 )
6 years ago
f821580b50
#Fix 745
6 years ago
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
6 years ago
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
6 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.
6 years ago
9cfe1dce20
Fix #739
6 years ago
cb0f3cd074
Fix #696
6 years ago
Ozzieisaacs