From b181fb74dca592ca7614b3149caabffa77d9b032 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Thu, 13 Oct 2016 18:16:15 -0500 Subject: [PATCH] Update DokuWiki to 2016-06-26a. --- .sandstorm/changelog.md | 5 ++ .sandstorm/sandstorm-files.list | 141 +++++++++++++++++++++++++++++- .sandstorm/sandstorm-pkgdef.capnp | 4 +- dokuwiki | 2 +- 4 files changed, 148 insertions(+), 4 deletions(-) diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index e25c708..0a24e9f 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,3 +1,8 @@ +# V4 (2016-10-14) + + * Refactor to service-config style for easier development + * Upgrade DokuWiki to 2016-06-26a + # V3 (2016-10-13) * Enhanced Sandstorm authentication plugin to preserve and return display names to DokuWiki diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index a8aed5f..8dc4b4f 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -2900,6 +2900,9 @@ opt/app/dokuwiki/lib/plugins.orig/acl/lang/ca/lang.php opt/app/dokuwiki/lib/plugins.orig/acl/lang/cs opt/app/dokuwiki/lib/plugins.orig/acl/lang/cs/help.txt opt/app/dokuwiki/lib/plugins.orig/acl/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/acl/lang/cy +opt/app/dokuwiki/lib/plugins.orig/acl/lang/cy/help.txt +opt/app/dokuwiki/lib/plugins.orig/acl/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/acl/lang/da opt/app/dokuwiki/lib/plugins.orig/acl/lang/da/help.txt opt/app/dokuwiki/lib/plugins.orig/acl/lang/da/lang.php @@ -3083,6 +3086,9 @@ opt/app/dokuwiki/lib/plugins.orig/authad/lang/ca/lang.php opt/app/dokuwiki/lib/plugins.orig/authad/lang/cs opt/app/dokuwiki/lib/plugins.orig/authad/lang/cs/lang.php opt/app/dokuwiki/lib/plugins.orig/authad/lang/cs/settings.php +opt/app/dokuwiki/lib/plugins.orig/authad/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authad/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/authad/lang/cy/settings.php opt/app/dokuwiki/lib/plugins.orig/authad/lang/da opt/app/dokuwiki/lib/plugins.orig/authad/lang/da/lang.php opt/app/dokuwiki/lib/plugins.orig/authad/lang/da/settings.php @@ -3193,7 +3199,11 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/bg/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs/lang.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cs/settings.php +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/cy/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/da +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/da/lang.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/da/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de opt/app/dokuwiki/lib/plugins.orig/authldap/lang/de-informal @@ -3211,6 +3221,7 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/es/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/et opt/app/dokuwiki/lib/plugins.orig/authldap/lang/et/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa/lang.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fa/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fi opt/app/dokuwiki/lib/plugins.orig/authldap/lang/fi/settings.php @@ -3226,6 +3237,7 @@ opt/app/dokuwiki/lib/plugins.orig/authldap/lang/hu opt/app/dokuwiki/lib/plugins.orig/authldap/lang/hu/lang.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/hu/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/it +opt/app/dokuwiki/lib/plugins.orig/authldap/lang/it/lang.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/it/settings.php opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ja opt/app/dokuwiki/lib/plugins.orig/authldap/lang/ja/lang.php @@ -3277,7 +3289,11 @@ opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/bg/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cs/settings.php +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/cy/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/da/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/de-informal @@ -3293,6 +3309,7 @@ opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/es/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fa/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fi opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/fi/settings.php @@ -3335,6 +3352,7 @@ opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/ru/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk +opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sk/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sl opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/sl/settings.php @@ -3349,6 +3367,68 @@ opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh-tw/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh/lang.php opt/app/dokuwiki/lib/plugins.orig/authmysql/lang/zh/settings.php opt/app/dokuwiki/lib/plugins.orig/authmysql/plugin.info.txt +opt/app/dokuwiki/lib/plugins.orig/authpdo +opt/app/dokuwiki/lib/plugins.orig/authpdo/README +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql.test.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql/fluxbb.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql/fluxbb.sql +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql/wordpress.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/mysql/wordpress.sql +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/pgsql +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/pgsql.test.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/pgsql/django.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/pgsql/django.sql +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/sqlite.test.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/_test/test.sqlite3 +opt/app/dokuwiki/lib/plugins.orig/authpdo/auth.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/conf +opt/app/dokuwiki/lib/plugins.orig/authpdo/conf/default.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/conf/metadata.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/bg +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/bg/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cs +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/de/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/en/settings.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/es +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/es/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fa +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fa/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fr +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/fr/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hr +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hr/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hu +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/hu/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/it +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/it/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ja +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ja/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ko +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ko/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/nl +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/nl/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt-br +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt-br/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/pt/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ru +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/ru/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/sk +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/sk/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/tr +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/tr/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/zh +opt/app/dokuwiki/lib/plugins.orig/authpdo/lang/zh/lang.php +opt/app/dokuwiki/lib/plugins.orig/authpdo/plugin.info.txt opt/app/dokuwiki/lib/plugins.orig/authpgsql opt/app/dokuwiki/lib/plugins.orig/authpgsql/auth.php opt/app/dokuwiki/lib/plugins.orig/authpgsql/conf @@ -3359,6 +3439,8 @@ opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/bg opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/bg/settings.php opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cs opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cs/settings.php +opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/cy/settings.php opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/da opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/da/settings.php opt/app/dokuwiki/lib/plugins.orig/authpgsql/lang/de @@ -3431,6 +3513,8 @@ opt/app/dokuwiki/lib/plugins.orig/authplain/lang/ca-valencia/lang.php opt/app/dokuwiki/lib/plugins.orig/authplain/lang/ca/lang.php opt/app/dokuwiki/lib/plugins.orig/authplain/lang/cs opt/app/dokuwiki/lib/plugins.orig/authplain/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/authplain/lang/cy +opt/app/dokuwiki/lib/plugins.orig/authplain/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/authplain/lang/da opt/app/dokuwiki/lib/plugins.orig/authplain/lang/da/lang.php opt/app/dokuwiki/lib/plugins.orig/authplain/lang/de @@ -3571,6 +3655,9 @@ opt/app/dokuwiki/lib/plugins.orig/config/lang/ca/lang.php opt/app/dokuwiki/lib/plugins.orig/config/lang/cs opt/app/dokuwiki/lib/plugins.orig/config/lang/cs/intro.txt opt/app/dokuwiki/lib/plugins.orig/config/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/config/lang/cy +opt/app/dokuwiki/lib/plugins.orig/config/lang/cy/intro.txt +opt/app/dokuwiki/lib/plugins.orig/config/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/config/lang/da opt/app/dokuwiki/lib/plugins.orig/config/lang/da/intro.txt opt/app/dokuwiki/lib/plugins.orig/config/lang/da/lang.php @@ -3614,6 +3701,9 @@ opt/app/dokuwiki/lib/plugins.orig/config/lang/he/intro.txt opt/app/dokuwiki/lib/plugins.orig/config/lang/he/lang.php opt/app/dokuwiki/lib/plugins.orig/config/lang/hi opt/app/dokuwiki/lib/plugins.orig/config/lang/hi/lang.php +opt/app/dokuwiki/lib/plugins.orig/config/lang/hr +opt/app/dokuwiki/lib/plugins.orig/config/lang/hr/intro.txt +opt/app/dokuwiki/lib/plugins.orig/config/lang/hr/lang.php opt/app/dokuwiki/lib/plugins.orig/config/lang/hu opt/app/dokuwiki/lib/plugins.orig/config/lang/hu/intro.txt opt/app/dokuwiki/lib/plugins.orig/config/lang/hu/lang.php @@ -3773,6 +3863,10 @@ opt/app/dokuwiki/lib/plugins.orig/extension/images/up.png opt/app/dokuwiki/lib/plugins.orig/extension/images/warning.png opt/app/dokuwiki/lib/plugins.orig/extension/lang opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg +opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_install.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_plugins.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_search.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/intro_templates.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/bg/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_install.txt @@ -3780,6 +3874,12 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_plugins.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_search.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/intro_templates.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/intro_install.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/intro_plugins.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/intro_search.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/intro_templates.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/da opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_install.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/da/intro_plugins.txt @@ -3810,6 +3910,10 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/es/intro_search.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/es/intro_templates.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/es/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa +opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa/intro_install.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa/intro_plugins.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa/intro_search.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa/intro_templates.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/fa/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/fi opt/app/dokuwiki/lib/plugins.orig/extension/lang/fi/lang.php @@ -3834,6 +3938,8 @@ opt/app/dokuwiki/lib/plugins.orig/extension/lang/hu/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/it opt/app/dokuwiki/lib/plugins.orig/extension/lang/it/intro_install.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/it/intro_plugins.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/it/intro_search.txt +opt/app/dokuwiki/lib/plugins.orig/extension/lang/it/intro_templates.txt opt/app/dokuwiki/lib/plugins.orig/extension/lang/it/lang.php opt/app/dokuwiki/lib/plugins.orig/extension/lang/ja opt/app/dokuwiki/lib/plugins.orig/extension/lang/ja/intro_install.txt @@ -3922,6 +4028,10 @@ opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cs opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cs/intro.txt opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cs/lang.php opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cs/submitted.txt +opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cy +opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cy/intro.txt +opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/popularity/lang/cy/submitted.txt opt/app/dokuwiki/lib/plugins.orig/popularity/lang/da opt/app/dokuwiki/lib/plugins.orig/popularity/lang/da/intro.txt opt/app/dokuwiki/lib/plugins.orig/popularity/lang/da/lang.php @@ -4101,6 +4211,9 @@ opt/app/dokuwiki/lib/plugins.orig/revert/lang/ca/lang.php opt/app/dokuwiki/lib/plugins.orig/revert/lang/cs opt/app/dokuwiki/lib/plugins.orig/revert/lang/cs/intro.txt opt/app/dokuwiki/lib/plugins.orig/revert/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/revert/lang/cy +opt/app/dokuwiki/lib/plugins.orig/revert/lang/cy/intro.txt +opt/app/dokuwiki/lib/plugins.orig/revert/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/revert/lang/da opt/app/dokuwiki/lib/plugins.orig/revert/lang/da/intro.txt opt/app/dokuwiki/lib/plugins.orig/revert/lang/da/lang.php @@ -4246,7 +4359,11 @@ opt/app/dokuwiki/lib/plugins.orig/styling/lang opt/app/dokuwiki/lib/plugins.orig/styling/lang/bg opt/app/dokuwiki/lib/plugins.orig/styling/lang/bg/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs +opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/cs/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy +opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy/intro.txt +opt/app/dokuwiki/lib/plugins.orig/styling/lang/cy/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/de opt/app/dokuwiki/lib/plugins.orig/styling/lang/de/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/de/lang.php @@ -4256,13 +4373,20 @@ opt/app/dokuwiki/lib/plugins.orig/styling/lang/en/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/es opt/app/dokuwiki/lib/plugins.orig/styling/lang/es/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/es/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/fa +opt/app/dokuwiki/lib/plugins.orig/styling/lang/fa/intro.txt +opt/app/dokuwiki/lib/plugins.orig/styling/lang/fa/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/fr opt/app/dokuwiki/lib/plugins.orig/styling/lang/fr/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/fr/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/hr +opt/app/dokuwiki/lib/plugins.orig/styling/lang/hr/intro.txt +opt/app/dokuwiki/lib/plugins.orig/styling/lang/hr/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/hu opt/app/dokuwiki/lib/plugins.orig/styling/lang/hu/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/hu/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/it +opt/app/dokuwiki/lib/plugins.orig/styling/lang/it/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/it/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/ja opt/app/dokuwiki/lib/plugins.orig/styling/lang/ja/intro.txt @@ -4273,13 +4397,19 @@ opt/app/dokuwiki/lib/plugins.orig/styling/lang/ko/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/nl opt/app/dokuwiki/lib/plugins.orig/styling/lang/nl/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/nl/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt-br/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/pt/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/ru/lang.php +opt/app/dokuwiki/lib/plugins.orig/styling/lang/sk +opt/app/dokuwiki/lib/plugins.orig/styling/lang/sk/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh +opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh-tw +opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh-tw/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh/intro.txt opt/app/dokuwiki/lib/plugins.orig/styling/lang/zh/lang.php opt/app/dokuwiki/lib/plugins.orig/styling/plugin.info.txt @@ -4340,6 +4470,14 @@ opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cs/import.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cs/intro.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cs/lang.php opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cs/list.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/add.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/delete.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/edit.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/import.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/intro.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/lang.php +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/cy/list.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/da opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/da/add.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/da/delete.txt @@ -4408,6 +4546,7 @@ opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/add.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/delete.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/edit.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/import.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/intro.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/lang.php opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/fa/list.txt @@ -4477,6 +4616,7 @@ opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/add.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/delete.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/edit.txt +opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/import.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/intro.txt opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/lang.php opt/app/dokuwiki/lib/plugins.orig/usermanager/lang/it/list.txt @@ -4748,7 +4888,6 @@ opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/_toc.css opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/basic.less opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/content.less opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/design.less -opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/mixins.less opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/mobile.less opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/pagetools.less opt/app/dokuwiki/lib/tpl.orig/dokuwiki/css/print.css diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 24aa0ea..49b462d 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "DokuWiki"), - appVersion = 3, # Increment this for every release. + appVersion = 4, # Increment this for every release. - appMarketingVersion = (defaultText = "2015-08-10a"), + appMarketingVersion = (defaultText = "2016-06-26a-sandstorm4"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/dokuwiki b/dokuwiki index 24f0804..5e2a993 160000 --- a/dokuwiki +++ b/dokuwiki @@ -1 +1 @@ -Subproject commit 24f08049eb5077f88fbfbfceea8108f24ae5ac18 +Subproject commit 5e2a9935a535c9d27a6430bc1d1f4e976bb26818