Merge branch 'develop' into 'master'

Merge develop into master

See merge request isard/isard-apps!22
Josep Maria Viñolas Auquer 2021-09-01 06:46:47 +00:00
commit ae3c4281e6
3 changed files with 11 additions and 1 deletions

View File

@ -14,7 +14,7 @@
- POSTGRES_USER=${DB_USER} - POSTGRES_USER=${DB_USER}
- POSTGRES_PASSWORD=${DB_PASSWORD} - POSTGRES_PASSWORD=${DB_PASSWORD}
- POSTGRES_EXTRA_OPTS=-Z9 --schema=public --blobs - POSTGRES_EXTRA_OPTS=-Z9 --schema=public --blobs
- SCHEDULE=@every 0h30m00s - SCHEDULE=@every 24h
- BACKUP_KEEP_DAYS=7 - BACKUP_KEEP_DAYS=7
- BACKUP_KEEP_WEEKS=4 - BACKUP_KEEP_WEEKS=4
- BACKUP_KEEP_MONTHS=6 - BACKUP_KEEP_MONTHS=6

View File

@ -12,4 +12,13 @@ jQuery(document).ready(() => {
$('#dropdownMenuApps').toggle() $('#dropdownMenuApps').toggle()
}) })
}) })
$(window).click( (event) => {
if (
!$(event.target).parents(
'#dropdownMenuAppsButton, #dropdownMenuApps'
).length
) {
$('#dropdownMenuApps').hide()
}
})
}) })

View File

@ -9,6 +9,7 @@ RewriteRule ^wp-admin$ wp-admin/ [R=301,L]
RewriteCond %{REQUEST_FILENAME} -f [OR] RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^ - [L] RewriteRule ^ - [L]
RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
RewriteRule . index.php [L] RewriteRule . index.php [L]