e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
ae7c4908f9
Fix #767
6 years ago
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
9a0e8fefb7
re-add loader code
6 years ago
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
6 years ago
5a863541de
Fix object object
6 years ago
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
7fb9bf8889
Truncate single quote in upload file name
6 years ago
3d5d95904a
Oauth working somehow (?)
6 years ago
a0be02e687
Ldap working
6 years ago
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
6 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 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
6 years ago
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
c1ef1bcd19
User and admin pages are working again
6 years ago
1fc4bc5204
Fix routes
...
Fix error page
6 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
d58d792f56
Catch Imagemagick policy error
6 years ago
d6ee8f75e9
More refactoring
6 years ago
a00d93a2d9
Working again (basically)
6 years ago
561d40f8ff
Merge branch 'master' into Develop
6 years ago
6fc4b318e8
cover folders beautified
6 years ago
36229076f7
Refactor subprocess calls
6 years ago
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
6 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
6 years ago
b75b91606c
Fix config oauth-UI
6 years ago
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
6 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 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
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
462cf20a34
Process all custom columns on editing
6 years ago
00ba231fbf
fix adding an existing language to a book
6 years ago
677264950d
Merge remote-tracking branch 'ru-translation/master'
6 years ago
e6b1c8cf36
Updated Russian translation
6 years ago
9057a3a0d7
Merge remote-tracking branch 'dutchtranslation/master'
6 years ago
45d97d277a
Update Dutch translation
...
Some lines where still untranslated, fixed it.
6 years ago
81e3afbcc4
Fix #714 (advanced search for ratings)
6 years ago
7526b0dcb4
Fix #623 , #715
6 years ago
64b1b830d6
Fix #712
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
47424e5c1a
Merge remote-tracking branch 'swedish/master'
...
Improved server stop command
6 years ago
bc0d19f33d
Fix typo
6 years ago
cbc9169973
Update messages.po
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
a2b612c9ab
Merge remote-tracking branch 'ssl/verify-ssl-paths'
6 years ago
2422f782de
Fix #701
6 years ago
c574b779fb
Added swedish translation
6 years ago
07d7be176c
Merge remote-tracking branch 'lang/master'
6 years ago
c6a5ac7f25
Fix wrong variable usage
6 years ago
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
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
8d6d28eb57
Merge remote-tracking branch 'titlelink/titles-links'
...
Fix for #694
6 years ago
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
38c180a9ea
Update translation files
6 years ago
c05687b896
Fix #668
6 years ago
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
Ozzieisaacs