mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-26 04:47:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/web.py
This commit is contained in:
Ozzie Isaacs
2021-12-04 20:56:04 +01:00
parent 1e9d88fa98 3bf173d958
commit cd5711e651
62 changed files with 3821 additions and 3690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cps/static/js/main.js
View File

@@ -284,11 +284,7 @@ $(function() {
}
function fillFileTable(path, type, folder, filt) {
if (window.location.pathname.endsWith("/basicconfig")) {
var request_path = "/../basicconfig/pathchooser/";
} else {
var request_path = "/../../ajax/pathchooser/";
}
var request_path = "/../../ajax/pathchooser/";
$.ajax({
dataType: "json",
data: {