Commit Graph

669 Commits (8022b1bb36fed807a77d896b5491d56bb519956b)

Author SHA1 Message Date
Ozzie Isaacs 4392fec7f5 Added fullscreen cover viewer 3 years ago
Ozzie Isaacs a47d6cd937 Fix confirm dialog database change
Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers)
3 years ago
Ozzie Isaacs 98fc1ee0a7 Comic reader code cleaning 3 years ago
Ozzie Isaacs 010c0bfc7d Improved error handling for content too long 3 years ago
Ozzie Isaacs 251780bed6 Added google scholar as metadata provider 3 years ago
Ozzie Isaacs decc2a9c79 Merge branch 'master' into Develop 3 years ago
Ozzie Isaacs b62d84424e Merge remote-tracking branch 'comic/comic_viewer_changes' into master 3 years ago
Ozzie Isaacs 3e5c944365 Changed backend for comic reader, now supports rar5 3 years ago
Ozzie Isaacs d95838309e Added config option for shelf sync behavior 3 years ago
Ozzie Isaacs b009dfe4ee Always use bootstrap datepicker 3 years ago
Ozzie Isaacs eba94f430c Updated js libs 3 years ago
Ozzie Isaacs 6bc426b21d Fix edit_books.js 3 years ago
Ozzie Isaacs 6bf360fbfb Added "comments" type to supported custom columns 3 years ago
Ozzie Isaacs b0cc52e0aa Enable custom column datetime (adv. search not working yet) #1984 3 years ago
Ozzie Isaacs 9ef705650b Access pages with stored order per default (#1987)
Fix for toggle-text of enable-sort button on shelf page
3 years ago
Ozzieisaacs b97373bf37 Improved error handling for disapearing custom column linked to read status 3 years ago
Ozzie Isaacs 64696fe973 Bugfixes edit user list (Fix #1938) 3 years ago
Ozzie Isaacs de7f039b99 Update list user editor (#1938) 3 years ago
Ozzie Isaacs 144c2b5fc7 Renaming ipadress - ip_address
Bugfix user table
Result testrun
Updated cn translation
3 years ago
GarcaMan 7da40d1c2e Added option to remove Y-Scrollbar and reset page scroll 3 years ago
Ozzie Isaacs 97e4707f72 user list column value and tags editor (#1938)
Bugfixes for massedit in user list (#1938)
Changed no. of debug messages
3 years ago
Ozzie Isaacs 450ee43677 Additional logging for emails 3 years ago
Ozzie Isaacs bb4749c65b Result for testrun
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
3 years ago
Ozzie Isaacs 3be5b5f919 Merge remote-tracking branch 'comic_reader/master' into master 3 years ago
Ozzie Isaacs 04ac5b69ac Further improvements on user list #1938 3 years ago
BuildTools 755eb1405b Fix progress bar direction 3 years ago
subdiox 0138294b36 Fix an issue that space key doesn't work intentionally when inverting reading direction 3 years ago
Ozzie Isaacs c0a4addf30 Cancel button in User edit now leads to the right page back #1938 3 years ago
Ozzie Isaacs d32b2ca524 Prevent traceback after delete user
flash message in case last admin role is removed #1938
3 years ago
Ozzie Isaacs d0a895628e Prevent delete of Guest user #1938 3 years ago
Ozzie Isaacs 0f95800dde Update sqlalchemy-utils dependency for oauth
Sort for state checkbox in user list and books list working
3 years ago
Ozzieisaacs b6177b27f4 Sorting of users in table according to selection possible 3 years ago
Ozzieisaacs ae97e87506 Delete user working from user table (#1938)
Comment in helper
3 years ago
Ozzie Isaacs 2d73f541c0 Bugfix sort books list and user list
Prevent transferring password hash to client
3 years ago
Ozzie Isaacs 7561eabe52 Implement Backend to deny editing Guest rights restriction #1938 3 years ago
Ozzie Isaacs 78071841cc After Deleting a book the list page is still displayed #1938 3 years ago
Ozzie Isaacs a43021e87c Fix for #1938 3 years ago
Ozzie Isaacs 8acd1f1fe4 Code refactoring and improved error handling for edit user list
Update teststatus
3 years ago
Ozzie Isaacs 665210e506 Fixes for book edit with title sort and author sort 3 years ago
Ozzie Isaacs 91b9370a21 Merge branch 'master' into development
# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
3 years ago
Ozzie Isaacs 1c42c4c969 Update bootstrap-table
Fixes for book edit
3 years ago
Ozzie Isaacs 6e406311c3 Fix #1928 (ldap_import_user_filter missing in to_save) 3 years ago
cbartondock 42a23ea23c removed some dumb graphical inconsistencies 3 years ago
cbartondock 710c31d1ca Fixed book details not loading after infinite scroll 3 years ago
cbartondock f637ba4dad Fixed border display in book details 3 years ago
Ozzie Isaacs a7eb547ca4 Renamed brazilian datepicker file 3 years ago
Ozzie Isaacs 0ceb12f74f Renamed brazilian datepicker file 3 years ago
Ozzie Isaacs 4960624de7 Merge branch 'master' into development 3 years ago
Ozzie Isaacs 2c92f24d89 Added Brazilian translation 3 years ago
Ozzie Isaacs f26beec1d3 Updated pdf reader 3 years ago
Ozzie Isaacs c4225e29ed Updated pdf reader 3 years ago
Ozzie Isaacs f4e134742b Fix updater
Bugfixes from testruns
Update Testresults
3 years ago
Ozzie Isaacs 4664b47851 Fixed alphabetical order in list and grid view
Completed download section
3 years ago
Ozzie Isaacs 10731696df Merge branch 'development' into cover_thumb
# Conflicts:
#	cps/admin.py
3 years ago
Ozzie Isaacs d3f8153b90 Merge branch 'master' into development 3 years ago
Ozzie Isaacs dd30ac4fbd Added thumbnails
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
3 years ago
Ozzie Isaacs b070ba142f Selects are working in user management with generic confirm dialog 3 years ago
Ozzie Isaacs bd7c6828bf Selects are working in user management 3 years ago
cbartondock d0671ec58c Merge branch 'master' of https://github.com/janeczku/calibre-web 3 years ago
cbartondock 1e40ffd1cc merge changes 3 years ago
Ozzie Isaacs da2c3e9ed7 Edit user mass change checkbox working 3 years ago
Ozzie Isaacs f62d6abb69 Merge branch 'master' into development
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
3 years ago
Ozzie Isaacs 994bc8b0e4 Removed dropdown button on single file listen/read (Fix #1840) 3 years ago
Ozzie Isaacs 2451605033 Merge remote-tracking branch 'djvu/read-djvu' into master 3 years ago
Ozzie Isaacs 4909ed5ccd Merge remote-tracking branch 'cliblur/master' into development
# Conflicts:
#	cps/static/css/style.css
3 years ago
Northguy bfe36d3f4a
change in color definition
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
    color: hsla(0, 0%, 100%, .45)
}
3 years ago
Northguy d42bf44fad
Added same color for series name and series number 3 years ago
Ozzie Isaacs 42707a19bd Code cosmetics 3 years ago
Ozzie Isaacs 0888706790 Code cosmetics 3 years ago
Ozzie Isaacs 16453a05f8 Code cosmetics 3 years ago
Ozzie Isaacs 2fbb7466d3 Code cosmetics 3 years ago
Ozzie Isaacs f29f94f45f Code cosmetics 3 years ago
Ozzie Isaacs cd973868fc Code cosmetics 3 years ago
Ozzie Isaacs 3c35f02cac Code cosmetics 3 years ago
Ozzie Isaacs 22c93e2389 Merge branch 'master' into development 3 years ago
Ozzie Isaacs 8c751eb532 Some code cosmetics 3 years ago
Ozzie Isaacs f52fa41439 Fix restart server
Some code cosmetics
3 years ago
Ozzie Isaacs f77d72fd86 Merge branch 'master' into development
# Conflicts:
#	cps/static/css/style.css
3 years ago
Ozzie Isaacs 9b80c84794 Some code cosmetics 3 years ago
Ozzie Isaacs 725fc658f8 Some code cosmetics 3 years ago
cbartondock 83474da7b5 fixed being able to click through dropdown in advanced search results 3 years ago
cbartondock 9146e5f287 fixed advanced search mass add to shelves in caliblur 3 years ago
Ozzie Isaacs 87d6008dfc Fix for #1870 (png was missing in supported picture formats for comic viewer) 3 years ago
Ozzie Isaacs b9c0c8d2dc Update bootstrap table to 1.18.2 3 years ago
Ozzie Isaacs 81c30d5fd5 Add missing files from bootstrap editable
Added user-table single-select header for locale and default-language
3 years ago
Ozzie Isaacs e64a504bb1 Working Locale and default language selection in user table edit 3 years ago
Ozzie Isaacs a3a11bdf3f Changed checkbox states are saved on server 3 years ago
Ozzie Isaacs 0992bafe30 Bulk User management 3 years ago
Ozzie Isaacs 251a77c8b4 Merge branch 'master' into Development
Improved packaging support
3 years ago
Ozzie Isaacs 127bfba135 fix wrong path in get_update_status js function 3 years ago
Ozzie Isaacs 1e5af21000 Fix #1843 (get path to script via html file and known js file instead of randomly picking last one) 3 years ago
Ozzie Isaacs 33a0a4c173 Changed function for getting path in js file 3 years ago
Ozzie Isaacs 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
Ozzie Isaacs f45ea1a31c Merge branch 'master' into development 3 years ago
Ozzie Isaacs a866dbaa80 Fix mimetype in comic reader 3 years ago
Ozzie Isaacs 62447d6b89 Basic User edit in tables 3 years ago
Ozzie Isaacs b07a97c17e Merge remote-tracking branch 'webp/comic-webp' into master 3 years ago
Ozzie Isaacs 41e7d65e2a Merge remote-tracking branch 'caliblur/master' into master 3 years ago
Ozzie Isaacs e6799e7a04 Improved detection of invalid email addresses (#1831) upon registering 3 years ago
Ozzie Isaacs 0f83f9992c Added swipe support for epub reader (fixes #925)
Cleaned reader js include files
3 years ago
Ozzie Isaacs d2ad78eb40 Added swipe support for comic reader and txt reader (#925)
Bugfix for txt file not present on serving file
3 years ago
mmonkey bc8bdfe385 Merge remote-tracking branch 'upstream/master' into master 4 years ago
OzzieIsaacs 682c3b834f Revert unrar5 experiment 4 years ago
Ozzieisaacs b100d198e8 Merge branch 'master' into Develop
Remove relate to referrer for tag/custom column allow / deny dialog
4 years ago
Ozzieisaacs 7849f2fb4b Remove relate to referrer for tag/custom column allow / deny dialog 4 years ago
Ozzieisaacs d33b0587cb Advanced search tags are now multiselects (#1240) 4 years ago
Ozzieisaacs 7e0ed537b7 irst steps Advanced search with mulitselects 4 years ago
Ozzieisaacs 1a83bddf8c Merge bubble read status 4 years ago
Ozzieisaacs 27dcbcd7e1 paged and orderable shelfs
Fix for non writable settings db with non configured calibre-web
4 years ago
Ozzieisaacs f6538b6110 New delete user button
refactored confirm dialogs
4 years ago
Ozzieisaacs 9a20faf640 Revert accidentally deleted lines in caliblur! theme 4 years ago
andylizi 123493ee59
Fix #1255 (support webp in comic viewer) 4 years ago
mmonkey 2d498dd138 Preserve publisher links, and fix formatting in custom columns for CaliBlur theme. 4 years ago
Ozzieisaacs d64009e23e preparation for filtered and ordered shelfs 4 years ago
Ozzieisaacs fd8b642d64 Code cosmetics css
Code cosmetics js
Fixes for links with remote_login
4 years ago
Ozzieisaacs 9130aceb5a Changed admin page 4 years ago
Ozzieisaacs b8336c03c3 Changed admin page 4 years ago
Ozzieisaacs d3986ca14a Server side file browser 4 years ago
Ozzieisaacs 2508c1abb2 Started implement server side filechooser 4 years ago
Ozzieisaacs cb1ebc1cd0 Drag 'n drop for files 4 years ago
Ozzieisaacs eed2f0a430 Merge remote-tracking branch 'comic/master' into master 4 years ago
Ozzieisaacs 31fe8cd263 Improvement for #1721 (shrinked generic cover) 4 years ago
Ozzieisaacs 42c13ae135 Fix for #1718 (fetch of metadata from google without cover leads to exception) 4 years ago
verglor 2343c79126 Use djvu_html5 to read djvu format in browser 4 years ago
verglor 09a5a69f86 djvu_html5 0.3.0-beta1 static assets 4 years ago
Markus Gruber 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
Ozzieisaacs 87d60308f2 Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master 4 years ago
Ozzieisaacs e99dd3310c Exchanged douban apikey 4 years ago
cbartondock bc52f90ed4 Merge remote-tracking branch 'upstream/master' 4 years ago
Ozzieisaacs ff88e68904 Add missing locale files 4 years ago
Ozzieisaacs 37a80b935d Added greek translation 4 years ago
celogeek 754b9832e9
fix height container 4 years ago
celogeek 097ac879ea
render read 4 years ago
cbartondock da9dfd166d fixed incorrect cover widths 4 years ago
cbartondock 1be07a42df Flex display to fix columns issue 4 years ago
Ghighi 2ff286b672 natural solution, pagination is changing on new page 4 years ago
Ghighi Eftimie 9adcfa99f4 trigger infinite scroll script only on templates where .load-more class is present 4 years ago
Ghighi Eftimie e723aaa5f6 fix for history state (+1 not needed) 4 years ago
Ghighi Eftimie f574f8faf0 better js check 4 years ago
Ghighi Eftimie cedfa90d76 fix for #981 4 years ago
Ghighi Eftimie f1e6f6e505 fixes for #1560 4 years ago
Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
4 years ago
Ozzieisaacs e1d5c2c578 Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master 4 years ago
Ozzieisaacs 49f49632ad Renamed CalibLur.css 4 years ago
Ghighi Eftimie 6dadc6fb1e same fix but hopefully better 4 years ago
Ozzieisaacs a58a2f5fe4 Added missing file for tr locale of datepicker 4 years ago
Ghighi Eftimie c33c6bbff0 fix for #1594 4 years ago
Ozzieisaacs 20ffa325d3 Fix #1642 4 years ago
Ozzieisaacs 6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
4 years ago
Ozzieisaacs cc0b0196f4 Store UI settings in flask session for guest user 4 years ago
Ozzieisaacs 497fbdcdfc Save view settings 4 years ago
Ozzieisaacs 861f1b2ca3 Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ryan Long a6002a2c6c 1622_updated_css 4 years ago
Ozzieisaacs 7ba014ba49 Fix "is not a valid language" on upload of comic books
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
4 years ago
OzzieIsaacs 98494c610a Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop 4 years ago
blitzmann 3e378bd665 Some more clean up 4 years ago
blitzmann c120138f26 Fixes for pagination ugliness for caliBlur! style 4 years ago
blitzmann 31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly 4 years ago
OzzieIsaacs 4c38b0ab10 Prepare for save name sort order 4 years ago
OzzieIsaacs f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
4 years ago
Ren Wei 4c6f5096be get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results. 4 years ago
Ozzieisaacs f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
4 years ago
Ozzieisaacs 2f833dc457 Fix login with remember me token 4 years ago
Ozzieisaacs 22344a3971 Improvements for delete book 4 years ago
Ozzieisaacs 8dde6ba60f UI improvements table buttons 4 years ago
Ozzieisaacs d44f283a05 View status in books table is stored 4 years ago
Ozzieisaacs c18d5786dd Improved validation check 4 years ago
Ozzieisaacs f26ccfe16c Table edit: validator routine to prevent empty fields working 4 years ago
Ozzieisaacs 1c681ee378 Improvements for books table editor 4 years ago
Ozzieisaacs 7b4306b1d6 UI improvements (same colors of buttons, etc.)
Changed Editable default value
4 years ago
Ozzieisaacs 4038cb5b85 Internal paged Search prepared
Search for table list is working
4 years ago
Ozzieisaacs 0dd0605a1f Book list for merging 4 years ago
Ozzieisaacs 94592b74a6 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs eef2112e1e #1430 (changed color of rating stars) 4 years ago
Michael Knepher 54cf3652b0 Add series name and index to book cover info 4 years ago
Ozzieisaacs b852fb0e26 Merge branch 'Develop' 4 years ago
Knepherbird 5cceeb6ef2
Fix: correct property typo
Correcting 'box-sizeing' to 'box-sizing'
4 years ago
Ozzieisaacs 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
h1f0x e325c3dbf6 fixed div selection in caliBlur.js 4 years ago
h1f0x b3fef625a8 Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view 4 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 4 years ago
Ozzieisaacs f5e12328dc Fix for #1382 (Restrictions with "&" in it can't be deleted) 4 years ago
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
4 years ago
jvoisin d8bf540db2 Remove an undeclared and useless local variable 4 years ago