Archives
/
calibre-web
mirror of https://github.com/janeczku/calibre-web
2
0
Fork 0
Code Issues Releases Wiki Activity
2,639 Commits
3 Branches
23 Tags
258 MiB
master
Develop
simple_view
0.6.0
0.6.10
0.6.11
0.6.12
0.6.13
0.6.14
0.6.15
0.6.16
0.6.17
0.6.18
0.6.19
0.6.2
0.6.20
0.6.21
0.6.22
0.6.23
0.6.3
0.6.4
0.6.5
0.6.6
0.6.7
0.6.8
0.6.9
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '12ad7a6322'
${ noResults }
Commit Graph

436 Commits (12ad7a63223bdb8f2135b692579e4bb6883ceb27)

Author SHA1 Message Date
Ozzieisaacs 486c0f2937 Fix for #1382 (Restrictions with "&" in it can't be deleted) 4 years ago
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop 
# Conflicts:
#	cps/helper.py
 4 years ago
OzzieIsaacs fe88010a72 Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur' 4 years ago
OzzieIsaacs 99ae4be2c2 Merge remote-tracking branch 'sec_fixes/bump_jquery' 4 years ago
jvoisin 30c9aa3df9 Minor fixes to caliBlur.js 
- Add alt attributes to images
- Fix a broken tag
 4 years ago
jvoisin 688184e255 Bump jquery 4 years ago
jvoisin 264b4b669e Bump underscorejs version from 1.9.1 to 1.12.2 4 years ago
Ozzieisaacs e1439b529b Config Options for limiting email size, change username to e-mail adress, use kepubify 
Added work on Unrar5 decompression (breaks comic reader totally)
 4 years ago
Ozzieisaacs fcefd8031a Fix #985 (png and webp are extracted as cover files from comic files) 4 years ago
Ozzieisaacs 0a92d79ec0 Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop 
# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py
 4 years ago
Ozzieisaacs b160a8de0b Merge branch 'master' into Develop 
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
 4 years ago
jvoisin 806a5f209f Fix two minor xss 4 years ago
Ozzieisaacs ce6b689147 Code cosmetics 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
 4 years ago
Ozzieisaacs 063ee5e855 Merge remote-tracking branch 'remove_usage_local_var_undeclared' 
Code cosmetics
 5 years ago
jvoisin d8bf540db2 Remove an undeclared and useless local variable 5 years ago
pthiben b90048d72e fix badge color on grid view to match list view 5 years ago
pthiben 38bb10d36b apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme. 
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
 5 years ago
pthiben 58943bb156 update filtering so that it also uses isotope everywhere. 
Fix asc/desc that did not match list view
 5 years ago
pthiben 5222e157cb fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it 5 years ago
pthiben 1e3a948977 fix linter errors 
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
 5 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop 
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
 5 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master' 
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
 5 years ago
Ozzieisaacs 587174b771 Fix #1272 5 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 5 years ago
hexeth da42c51af2 Updated to exclude new modules 5 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 4eacb21259 Update updater 
Update change logfile
code cosmetics js files
 5 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 5 years ago
Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop 
# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py
 5 years ago
Wanoo a0535aa3db Add ComicVine Api 
Fetching Metadata for comicBook with ComicVine API
 5 years ago
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 ba6b5f8fd1 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 5 years ago
Kyos 509071949a Moved style to css file 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 c659f28334 Fix #1128 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
Kyos c93dd32179 Fixed typo and column size for LG screens 5 years ago
Kyos ada727a570 Adds Authors, Series and Book Cover to the shelf order view 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 b9c3a3fcea Fix #652 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 5 years ago
Ozzieisaacs 3f5c6c1fa5 Fix #937 5 years ago
Ozzieisaacs c81d4edb7d Fix for #923 5 years ago
Ozzieisaacs 26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 5 years ago
Ozzieisaacs ecedf92783 Update version 
Make custom columns visible (#904)
 5 years ago
subdiox 867aa2f0bd Beautify bitjs 5 years ago
subdiox 7982ed877c Downgrade bitjs to es5 branch 5 years ago
subdiox c0d136ccd8 Fix slow loading 5 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 fa276fd0d3 Add scrollbar to metadata load screen 
Small UI improvements in metadata load screen
 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
leram84 ae279c5123
fixed description read-more button 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
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 9ee4b7f77c Revert "Not ready for commit" 
This reverts commit 6a2ebba85b.
 6 years ago
hexeth 6a2ebba85b
Not ready for commit 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
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 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
leram84 db83fb3bd7
minified 6 years ago
leram84 f897491070
Update caliBlur.min.css 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 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
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
leram84 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
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master' 6 years ago
hexeth 418e98d1f8 update .published-date to .publishing-date (#756) 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