Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

4 files changed, 51 insertions, 0 deletions

diff --git a/_test/conf/acl.auth.php b/_test/conf/acl.auth.php
new file mode 100644
index 000000000..14344d778
--- /dev/null
+++ b/_test/conf/acl.auth.php
@@ -0,0 +1,21 @@
+# acl.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Editing this file by hand shouldn't be necessary. Use the ACL
+# Manager interface instead.
+#
+# If your auth backend allows special char like spaces in groups
+# or user names you need to urlencode them (only chars <128, leave
+# UTF-8 multibyte chars as is)
+#
+# none   0
+# read   1
+# edit   2
+# create 4
+# upload 8
+# delete 16
+
+*               @ALL        8
diff --git a/_test/conf/local.php b/_test/conf/local.php
new file mode 100644
index 000000000..ff1299393
--- /dev/null
+++ b/_test/conf/local.php
@@ -0,0 +1,10 @@
+<?php
+
+$conf['savedir']     = DOKU_TMP_DATA;     //where to store all the files
+
+$conf['title']       = 'My Test Wiki';    //what to show in the title
+
+$conf['useacl']      = 1;                 //Use Access Control Lists to restrict access?
+$conf['superuser']   = 'testuser';        //password: testpass
+
+$conf['dnslookups']  = 0;                 //speedup tests
diff --git a/_test/conf/plugins.local.php b/_test/conf/plugins.local.php
new file mode 100644
index 000000000..00e8c10be
--- /dev/null
+++ b/_test/conf/plugins.local.php
@@ -0,0 +1,8 @@
+<?php
+/*
+ * Local plugin enable/disable settings
+ * Auto-generated through plugin/extension manager
+ *
+ * NOTE: Plugins will not be added to this file unless there is a need to override a default setting. Plugins are
+ *       enabled by default, unless having a 'disabled' file in their plugin folder.
+ */
diff --git a/_test/conf/users.auth.php b/_test/conf/users.auth.php
new file mode 100644
index 000000000..4adee0d4b
--- /dev/null
+++ b/_test/conf/users.auth.php
@@ -0,0 +1,12 @@
+# users.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Userfile
+#
+# Format:
+#
+# user:MD5password:Real Name:email:groups,comma,seperated
+#
+# testuser : testpass
+testuser:179ad45c6ce2cb97cf1029e212046e81:Arthur Dent:arthur@example.com: