Commit Graph

1197 Commits (cc8a431532c080d440868e2b31d6d7080dfb3e24)

Author SHA1 Message Date
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 5 years ago
Ozzieisaacs a0a15b4598 Fix max authors shown 5 years ago
Ozzieisaacs 4a33278596 Update ratings 5 years ago
Ozzieisaacs 6d2270d931 Fixes for Oauth 5 years ago
Ozzieisaacs 1db1c2e7df Enabling LDAP working again
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
5 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
5 years ago
Ozzieisaacs 76d40411dd Translation updated 5 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 5 years ago
Ozzieisaacs 0b0e62fdf2 Merge remote-tracking branch 'dialog/master'
Fix for #833
5 years ago
Ozzieisaacs 6f80a63ca6 Fix for #827 5 years ago
Andrew Sullivan 3dfc2f2580 fixing issue #833 5 years ago
Ozzieisaacs 5b0a0e2139 Fix #835 5 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 5 years ago
Ozzieisaacs 6f0b3bbda0 Fix for #812 5 years ago
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
5 years ago
Ozzieisaacs 1561a4abdf Comic improvments 5 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
Ozzieisaacs 466af21548 Code Cosmetics 5 years ago
Ozzieisaacs 0224d45961 Code cosmetics 5 years ago
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 5 years ago
Ozzieisaacs 6269a83c3d Fix mismerge user logon with python3 in opds feed 5 years ago
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 5 years ago
Ozzieisaacs fb23db57b4 Added filtering of authors, series, categories, publishers 5 years ago
Ozzieisaacs 11b770b3fb Fix for #830
Fix user with umlauts
5 years ago
Ozzieisaacs fda977b155 Fix for users with umlauts 5 years ago
Ozzieisaacs 68a36597ab Fix opds login on python3 5 years ago
Ozzieisaacs fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
5 years ago
Ozzieisaacs de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
5 years ago
jianyun.zhao 54a006a420 [fix] Add a scroll bar to a long list of meta information 5 years ago
Ozzieisaacs 361a1243d7 Improvements #828 5 years ago
Ozzieisaacs 246d7673a9 Corrected file header with copyright information 5 years ago
Virgil Grigoras bd7b0175a1 Fix remaining shown by codacy 5 years ago
Virgil Grigoras f5cf62f209 Fix issues shown by codacy 5 years ago
Virgil Grigoras 15aa49e163 shorten authors in author / discover / index / search and shelf 5 years ago
Virgil Grigoras 3272b4ca1e configuration field for max_authors 5 years ago
Virgil Grigoras d3ed0317bb styling and javascript for hiding authors 5 years ago
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 5 years ago
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
5 years ago
Ozzieisaacs fad62a0909 translation update 5 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
5 years ago
Ozzieisaacs 1de3929988 Unicode 5 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
5 years ago
Ozzieisaacs 0facb8fffa Fix #766 5 years ago
Ozzieisaacs 1a7052b287 Update pdf upload
Translation of uploadprogress dialog
5 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.
5 years ago
Ozzieisaacs 17b7333992 Merge remote-tracking branch 'caliblur/master' 5 years ago
leram84 ae279c5123
fixed description read-more button 5 years ago
Ozzieisaacs e92497b34e Merge branch 'master' into Develop
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
5 years ago
Ozzieisaacs ae7c4908f9 Fix #767 5 years ago
Ozzieisaacs ea1a882353 Merge remote-tracking branch 'origin/master' 5 years ago
hexeth 9a0e8fefb7
re-add loader code 5 years ago
Matt c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web 5 years ago
hexeth 5a863541de
Fix object object 5 years ago
Ozzie Isaacs 4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7 5 years ago
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
5 years ago
Fabian Wüthrich 7fb9bf8889
Truncate single quote in upload file name 5 years ago
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 5 years ago
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 5 years ago
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
5 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
5 years ago
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
5 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
Ozzieisaacs d58d792f56 Catch Imagemagick policy error 5 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 5 years ago
Ozzieisaacs 36229076f7 Refactor subprocess calls 5 years ago
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
5 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
5 years ago
Ozzieisaacs b75b91606c Fix config oauth-UI 5 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 5 years ago
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 5 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
5 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