f62d6abb69
Merge branch 'master' into development
...
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
3 years ago
994bc8b0e4
Removed dropdown button on single file listen/read ( Fix #1840 )
3 years ago
2451605033
Merge remote-tracking branch 'djvu/read-djvu' into master
3 years ago
42707a19bd
Code cosmetics
3 years ago
16453a05f8
Code cosmetics
3 years ago
3c35f02cac
Code cosmetics
3 years ago
22c93e2389
Merge branch 'master' into development
3 years ago
8c751eb532
Some code cosmetics
3 years ago
f52fa41439
Fix restart server
...
Some code cosmetics
3 years ago
f77d72fd86
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/style.css
3 years ago
9b80c84794
Some code cosmetics
3 years ago
725fc658f8
Some code cosmetics
3 years ago
83474da7b5
fixed being able to click through dropdown in advanced search results
3 years ago
9146e5f287
fixed advanced search mass add to shelves in caliblur
3 years ago
87d6008dfc
Fix for #1870 (png was missing in supported picture formats for comic viewer)
3 years ago
b9c0c8d2dc
Update bootstrap table to 1.18.2
3 years ago
e64a504bb1
Working Locale and default language selection in user table edit
3 years ago
a3a11bdf3f
Changed checkbox states are saved on server
3 years ago
0992bafe30
Bulk User management
3 years ago
251a77c8b4
Merge branch 'master' into Development
...
Improved packaging support
3 years ago
127bfba135
fix wrong path in get_update_status js function
3 years ago
1e5af21000
Fix #1843 (get path to script via html file and known js file instead of randomly picking last one)
3 years ago
33a0a4c173
Changed function for getting path in js file
3 years ago
eeb7974e05
User table:
...
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
3 years ago
f45ea1a31c
Merge branch 'master' into development
3 years ago
a866dbaa80
Fix mimetype in comic reader
3 years ago
62447d6b89
Basic User edit in tables
3 years ago
b07a97c17e
Merge remote-tracking branch 'webp/comic-webp' into master
3 years ago
41e7d65e2a
Merge remote-tracking branch 'caliblur/master' into master
3 years ago
e6799e7a04
Improved detection of invalid email addresses ( #1831 ) upon registering
3 years ago
0f83f9992c
Added swipe support for epub reader ( fixes #925 )
...
Cleaned reader js include files
4 years ago
d2ad78eb40
Added swipe support for comic reader and txt reader ( #925 )
...
Bugfix for txt file not present on serving file
4 years ago
bc8bdfe385
Merge remote-tracking branch 'upstream/master' into master
4 years ago
682c3b834f
Revert unrar5 experiment
4 years ago
b100d198e8
Merge branch 'master' into Develop
...
Remove relate to referrer for tag/custom column allow / deny dialog
4 years ago
7849f2fb4b
Remove relate to referrer for tag/custom column allow / deny dialog
4 years ago
d33b0587cb
Advanced search tags are now multiselects ( #1240 )
4 years ago
7e0ed537b7
irst steps Advanced search with mulitselects
4 years ago
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
4 years ago
f6538b6110
New delete user button
...
refactored confirm dialogs
4 years ago
123493ee59
Fix #1255 (support webp in comic viewer)
4 years ago
2d498dd138
Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.
4 years ago
fd8b642d64
Code cosmetics css
...
Code cosmetics js
Fixes for links with remote_login
4 years ago
d3986ca14a
Server side file browser
4 years ago
2508c1abb2
Started implement server side filechooser
4 years ago
cb1ebc1cd0
Drag 'n drop for files
4 years ago
42c13ae135
Fix for #1718 (fetch of metadata from google without cover leads to exception)
4 years ago
2343c79126
Use djvu_html5 to read djvu format in browser
4 years ago
09a5a69f86
djvu_html5 0.3.0-beta1 static assets
4 years ago
f2c52fd278
Update jszip to 3.5.0. Update epub.js to 0.3.88.
...
Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work.
4 years ago
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
4 years ago
e99dd3310c
Exchanged douban apikey
4 years ago
ff88e68904
Add missing locale files
4 years ago
37a80b935d
Added greek translation
4 years ago
2ff286b672
natural solution, pagination is changing on new page
4 years ago
9adcfa99f4
trigger infinite scroll script only on templates where .load-more class is present
4 years ago
e723aaa5f6
fix for history state (+1 not needed)
4 years ago
f574f8faf0
better js check
4 years ago
cedfa90d76
fix for #981
4 years ago
a58a2f5fe4
Added missing file for tr locale of datepicker
4 years ago
20ffa325d3
Fix #1642
4 years ago
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
4 years ago
cc0b0196f4
Store UI settings in flask session for guest user
4 years ago
497fbdcdfc
Save view settings
4 years ago
98494c610a
Merge branch 'master' into Develop
4 years ago
4c38b0ab10
Prepare for save name sort order
4 years ago
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
4 years ago
4c6f5096be
get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.
4 years ago
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
4 years ago
2f833dc457
Fix login with remember me token
4 years ago
22344a3971
Improvements for delete book
4 years ago
d44f283a05
View status in books table is stored
4 years ago
c18d5786dd
Improved validation check
4 years ago
f26ccfe16c
Table edit: validator routine to prevent empty fields working
4 years ago
1c681ee378
Improvements for books table editor
4 years ago
7b4306b1d6
UI improvements (same colors of buttons, etc.)
...
Changed Editable default value
4 years ago
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
4 years ago
0dd0605a1f
Book list for merging
4 years ago
b852fb0e26
Merge branch 'Develop'
4 years ago
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
4 years ago
e325c3dbf6
fixed div selection in caliBlur.js
4 years ago
b3fef625a8
Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
4 years ago
f5e12328dc
Fix for #1382 (Restrictions with "&" in it can't be deleted)
4 years ago
486c0f2937
Fix for #1382 (Restrictions with "&" in it can't be deleted)
4 years ago
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
4 years ago
fe88010a72
Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'
4 years ago
99ae4be2c2
Merge remote-tracking branch 'sec_fixes/bump_jquery'
4 years ago
30c9aa3df9
Minor fixes to caliBlur.js
...
- Add alt attributes to images
- Fix a broken tag
4 years ago
688184e255
Bump jquery
4 years ago
264b4b669e
Bump underscorejs version from 1.9.1 to 1.12.2
4 years ago
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
fcefd8031a
Fix #985 (png and webp are extracted as cover files from comic files)
4 years ago
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
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
806a5f209f
Fix two minor xss
4 years ago
2d92818613
Code cosmetics
4 years ago
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
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
4 years ago
d8bf540db2
Remove an undeclared and useless local variable
4 years ago
58943bb156
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
4 years ago
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
4 years ago
a194216568
Merge remote-tracking branch 'origin/master'
4 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
4 years ago
587174b771
Fix #1272
4 years ago
5864637f1c
Merge branch 'master' into Develop
4 years ago
da42c51af2
Updated to exclude new modules
4 years ago
f6c04b9b84
Merge branch 'master' into Develop
4 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
4 years ago
f243515261
Fix #950 (sorting order in comics)
4 years ago
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
4 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
4 years ago
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
4 years ago
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
4 years ago
7c89f0b5b9
Merge with branch develop
...
Release version
4 years ago
371097eb4d
Update Updater
4 years ago
29cb8bfec4
Fix #1210
4 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
4 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
4 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
4 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
4 years ago
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
4 years ago
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
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
5 years ago
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
5 years ago
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
56964a890b
caliBlur theme: fix custom column display that contain colons
5 years ago
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
5 years ago
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
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
d9adb4fc94
Improvements for limit tags
5 years ago
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
1da4efec86
Merge branch 'master' into Develop
5 years ago
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
5 years ago
bbe91f439a
Merge from master
5 years ago
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
222797e631
support douban book search using apikey
5 years ago
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
5 years ago
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
5 years ago
c6542fdec6
New Oauth code
5 years ago
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
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
cd546eb6d4
Update comic reader js
5 years ago
c81d4edb7d
Fix for #923
5 years ago
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
5 years ago
ecedf92783
Update version
...
Make custom columns visible (#904 )
5 years ago
867aa2f0bd
Beautify bitjs
5 years ago
7982ed877c
Downgrade bitjs to es5 branch
5 years ago
c0d136ccd8
Fix slow loading
5 years ago
c2bfb29726
Add reading direction settings to readcbr page
5 years ago
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
5 years ago
0b8624b542
Deleted load metadata from douban, as API seems to be shut down ( #858 )
5 years ago
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
5 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
5 years ago
439ce19b5d
Updated epub.js to v0.3.66
5 years ago
4b301a7961
Additional fix for #845 (in case of error)
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
6f0b3bbda0
Fix for #812
5 years ago
466af21548
Code Cosmetics
5 years ago
361a1243d7
Improvements #828
5 years ago
bd7b0175a1
Fix remaining shown by codacy
5 years ago
f5cf62f209
Fix issues shown by codacy
5 years ago
d3ed0317bb
styling and javascript for hiding authors
5 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
5 years ago
17b7333992
Merge remote-tracking branch 'caliblur/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
56826f67fc
progressbar during upload thanks to jim3ma
5 years ago
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
5 years ago
9128615f48
Fix #424
...
Fix #425
6 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
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
83a905bfe1
Don't remove the dropdown toggle
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
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
9e5fa45df7
Removed unnecessary wait message
6 years ago
cc618ecee7
Fix Limiting domains (related to #773 )
6 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
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
2ab10bb070
Update caliBlur.js
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
7032f311d5
Update caliBlur.js
6 years ago
66fcd71685
Merge remote-tracking branch 'origin/master'
6 years ago
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
Ozzie Isaacs
cbartondock
mmonkey
andylizi
verglor
Markus Gruber
Ghighi
Ren Wei
h1f0x
jvoisin
pthiben
hexeth
Wanoo
Johnny A. dos Santos
Michael Shavit
Simon Latapie
zhiyue
Dmitriy Istomin
subdiox
Daniel Pavel
Andrew Sullivan
Virgil Grigoras
hexeth
Matt
Ozzie Isaacs
lorek123