Commit Graph

274 Commits (376001100a7ea74b01c1cb03e609bf5ed6458621)

Author SHA1 Message Date
Ozzieisaacs 146068c936 Merge branch 'Develop'
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
5 years ago
Ozzieisaacs 3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1'
Fix #1210 Load multiple authors correct via get metadata
5 years ago
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
5 years ago
OzzieIsaacs 371097eb4d Update Updater 5 years ago
Johnny A. dos Santos 29cb8bfec4
Fix #1210 5 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 5 years ago
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
5 years ago
Ozzieisaacs b33a2ac90d Fix #1170 Auth-digest Header no longer crashs calibre-web
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
5 years ago
Michael Shavit c0239a659c Add UI support for archived books.
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
5 years ago
Ozzieisaacs 3a4d351a57 Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop 5 years ago
Ozzieisaacs 973f555544 Merge branch 'master' into Develop
(updated tinymce and bootstrap datepicker)
5 years ago
Ozzieisaacs 1d7e52c198 Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
5 years ago
Simon Latapie 56964a890b caliBlur theme: fix custom column display that contain colons 5 years ago
Ozzieisaacs 68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
5 years ago
Ozzieisaacs 79a9ef4859 Make Kobo optional
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
5 years ago
Ozzieisaacs 661ed17d23 Handle stream output in logviewer
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
5 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 5 years ago
Ozzieisaacs 513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
5 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 5 years ago
Ozzieisaacs bbe91f439a Merge from master 5 years ago
Ozzieisaacs b586a32843 Fix #1115 (comic reader not working under iOS, maybe invalid issue)
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
zhiyue 222797e631
support douban book search using apikey 5 years ago
Ozzieisaacs 0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 5 years ago
Dmitriy Istomin a65ad9483c update Bootstrap v3.4.0 -> 3.4.1 5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 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 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 cd546eb6d4 Update comic reader js 6 years ago
Ozzieisaacs c81d4edb7d Fix for #923 6 years ago
Ozzieisaacs 26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 6 years ago
Ozzieisaacs ecedf92783 Update version
Make custom columns visible (#904)
6 years ago
subdiox 867aa2f0bd Beautify bitjs 6 years ago
subdiox 7982ed877c Downgrade bitjs to es5 branch 6 years ago
subdiox c0d136ccd8 Fix slow loading 6 years ago
subdiox c2bfb29726 Add reading direction settings to readcbr page 6 years ago
subdiox 204de4aef6 Fix an issue that fullscreen doens't work on some browsers 6 years ago
Ozzieisaacs 0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 6 years ago
Ozzieisaacs 436c2671d1 Fix delete domain entries
Fix error handling smtp.authentication error
6 years ago
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
6 years ago
Daniel Pavel 439ce19b5d Updated epub.js to v0.3.66 6 years ago
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 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 6f0b3bbda0 Fix for #812 6 years ago
Ozzieisaacs 466af21548 Code Cosmetics 6 years ago
Ozzieisaacs 361a1243d7 Improvements #828 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 d3ed0317bb styling and javascript for hiding authors 6 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
6 years ago
Ozzieisaacs 17b7333992 Merge remote-tracking branch 'caliblur/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 56826f67fc progressbar during upload thanks to jim3ma 6 years ago
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 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 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
hexeth 83a905bfe1
Don't remove the dropdown toggle 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
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
Ozzie Isaacs 9e5fa45df7
Removed unnecessary wait message 6 years ago
Ozzie Isaacs cc618ecee7
Fix Limiting domains (related to #773) 6 years ago
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
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
hexeth 2ab10bb070
Update caliBlur.js 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 7032f311d5
Update caliBlur.js 6 years ago
Ozzieisaacs 66fcd71685 Merge remote-tracking branch 'origin/master' 6 years ago
hexeth e1205b75cd Fix targeting for language support (#761)
Some other languages use 'description :' instead of 'description:' .
6 years ago
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
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 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 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
Ozzieisaacs c05687b896 Fix #668 6 years ago
Virgil Grigoras 016c7b4b1c Add ability to store and edit publishers 6 years ago
Virgil Grigoras cb5adb3a31 Display "what's new" information for newer versions than the current one 6 years ago
Virgil Grigoras f477d48c7c More robust handling while checking for new updates 6 years ago
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
6 years ago
OzzieIsaacs 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