From 2a2a2ba2f6092b0b68a7de0ccc798062682487f4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 2 Aug 2013 21:35:13 +0100 Subject: added basic suport for embedding (html5) videos --- conf/mime.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/mime.conf b/conf/mime.conf index 381b93f86..2a50fab10 100644 --- a/conf/mime.conf +++ b/conf/mime.conf @@ -13,6 +13,9 @@ swf application/x-shockwave-flash mp3 audio/mpeg ogg audio/ogg wav audio/wav +webm video/webm +ogv video/ogg +mp4 video/mp4 tgz !application/octet-stream tar !application/x-gtar -- cgit v1.2.3 From 16660d32b7c1e36a9940ee0ee9b692bf0dd1c313 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 5 Jan 2014 20:29:14 +0100 Subject: use config for firguring out if an extension is protected --- conf/plugins.required.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/plugins.required.php b/conf/plugins.required.php index 26eb8888b..078f6d56d 100644 --- a/conf/plugins.required.php +++ b/conf/plugins.required.php @@ -4,8 +4,8 @@ * from changes by the extention manager. These settings will override any local settings. * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades. */ -$plugins['acl'] = 1; -$plugins['plugin'] = 1; -$plugins['config'] = 1; -$plugins['usermanager'] = 1; -$plugins['revert'] = 1; +$plugins['acl'] = 1; +$plugins['plugin'] = 1; +$plugins['config'] = 1; +$plugins['usermanager'] = 1; +$plugins['template:dokuwiki'] = 1; // not a plugin, but this should not be uninstalled either -- cgit v1.2.3 From 168f022328fee27758bfd983b209a579621409f6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 5 Jan 2014 20:31:11 +0100 Subject: protect extension, not plugin anymore --- conf/plugins.required.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/plugins.required.php b/conf/plugins.required.php index 078f6d56d..a2950b760 100644 --- a/conf/plugins.required.php +++ b/conf/plugins.required.php @@ -5,7 +5,7 @@ * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades. */ $plugins['acl'] = 1; -$plugins['plugin'] = 1; +$plugins['extension'] = 1; $plugins['config'] = 1; $plugins['usermanager'] = 1; $plugins['template:dokuwiki'] = 1; // not a plugin, but this should not be uninstalled either -- cgit v1.2.3 From 5284857cb2f94bc347eb56c694d894283fc41703 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 5 Jan 2014 20:45:32 +0100 Subject: protect authplain and current auth plugin --- conf/plugins.required.php | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/plugins.required.php b/conf/plugins.required.php index a2950b760..75336da2e 100644 --- a/conf/plugins.required.php +++ b/conf/plugins.required.php @@ -5,6 +5,7 @@ * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades. */ $plugins['acl'] = 1; +$plugins['authplain'] = 1; $plugins['extension'] = 1; $plugins['config'] = 1; $plugins['usermanager'] = 1; -- cgit v1.2.3 From ad5be2d08559b834f85255bc802b4a6a6887af6b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 2 Feb 2014 17:09:46 +0100 Subject: fix comment typo FS#2923 --- conf/entities.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/entities.conf b/conf/entities.conf index be9ed6d40..c0d653c18 100644 --- a/conf/entities.conf +++ b/conf/entities.conf @@ -2,7 +2,7 @@ # # Order does matter! # -# You can use HTML entities here, but it is not recomended because it may break +# You can use HTML entities here, but it is not recommended because it may break # non-HTML renderers. Use UTF-8 chars directly instead. <-> ↔ -- cgit v1.2.3