From 21606750a4ae0a46937a589ca323c250f26a2e58 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 16 Feb 2013 14:24:44 +0000 Subject: added explaining text to _dummy files (fixes issues with some archivers, FS#2616) --- data/_dummy | 1 + data/attic/_dummy | 1 + data/cache/_dummy | 1 + data/index/_dummy | 1 + data/locks/_dummy | 1 + data/media_attic/_dummy | 1 + data/media_meta/_dummy | 1 + data/meta/_dummy | 1 + data/tmp/_dummy | 1 + 9 files changed, 9 insertions(+) (limited to 'data') diff --git a/data/_dummy b/data/_dummy index e69de29bb..e492265be 100644 --- a/data/_dummy +++ b/data/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/attic/_dummy b/data/attic/_dummy index e69de29bb..e492265be 100644 --- a/data/attic/_dummy +++ b/data/attic/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/cache/_dummy b/data/cache/_dummy index e69de29bb..e492265be 100644 --- a/data/cache/_dummy +++ b/data/cache/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/index/_dummy b/data/index/_dummy index e69de29bb..e492265be 100644 --- a/data/index/_dummy +++ b/data/index/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/locks/_dummy b/data/locks/_dummy index e69de29bb..e492265be 100644 --- a/data/locks/_dummy +++ b/data/locks/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/media_attic/_dummy b/data/media_attic/_dummy index e69de29bb..e492265be 100644 --- a/data/media_attic/_dummy +++ b/data/media_attic/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/media_meta/_dummy b/data/media_meta/_dummy index e69de29bb..e492265be 100644 --- a/data/media_meta/_dummy +++ b/data/media_meta/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/meta/_dummy b/data/meta/_dummy index e69de29bb..e492265be 100644 --- a/data/meta/_dummy +++ b/data/meta/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/data/tmp/_dummy b/data/tmp/_dummy index e69de29bb..e492265be 100644 --- a/data/tmp/_dummy +++ b/data/tmp/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file -- cgit v1.2.3 From f00926dd85886b81600997f6b4fbc69af9deacad Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 22 Feb 2013 09:46:43 +0100 Subject: little change to syntax we had on the life site --- data/pages/wiki/syntax.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 55bbabab2..f2c2864ed 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -83,9 +83,9 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha Notes: * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). - * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/local.protected.php'': + * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'': - $lang['js']['nosmblinks'] = ''; + LANG.nosmblinks = ''; ==== Image Links ==== -- cgit v1.2.3 From 5721a1547938df76003c6d91ea003dc1c70abd94 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Wed, 6 Mar 2013 14:02:31 +0100 Subject: Release preparations --- data/deleted.files | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'data') diff --git a/data/deleted.files b/data/deleted.files index fada1f29e..4b9657da2 100644 --- a/data/deleted.files +++ b/data/deleted.files @@ -4,6 +4,15 @@ # A copy of this list is maintained at # http://www.dokuwiki.org/install:upgrade#files_to_remove +# removed in 2013-04-06 +inc/adLDAP.php +inc/auth/ad.class.php +inc/auth/basic.class.php +inc/auth/ldap.class.php +inc/auth/mysql.class.php +inc/auth/pgsql.class.php +inc/auth/plain.class.php + # removed in 2012-09-10 lib/images/icon-file.png lib/images/icon-thumb.png -- cgit v1.2.3 From 8c447db27f2ba34e86e64fe285e1ecfe08e486f1 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 9 Mar 2013 17:33:38 +0000 Subject: increased copyright year in wiki:dokuwiki --- data/pages/wiki/dokuwiki.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index e6fac5b65..2db4dbef3 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -57,7 +57,7 @@ All documentation and additional information besides the [[syntax|syntax descrip ===== Copyright ===== -2004-2010 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community +2004-2013 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). -- cgit v1.2.3 From 8e06db6889203ff5a40f4f121ba46c898564f628 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 19 Apr 2013 11:48:56 +0200 Subject: removed Satisfy All directive FS#2750 --- data/.htaccess | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/.htaccess b/data/.htaccess index 2cbb757e7..281d5c33d 100644 --- a/data/.htaccess +++ b/data/.htaccess @@ -1,3 +1,2 @@ order allow,deny deny from all -Satisfy All -- cgit v1.2.3 From 2a5a1456564635ddbca06edbc902e7f820d2a97b Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Fri, 10 May 2013 14:34:29 +0200 Subject: Release preparation --- data/deleted.files | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/deleted.files b/data/deleted.files index 4b9657da2..664086c25 100644 --- a/data/deleted.files +++ b/data/deleted.files @@ -4,6 +4,9 @@ # A copy of this list is maintained at # http://www.dokuwiki.org/install:upgrade#files_to_remove +# removed in 2013-05-10 +lib/plugins/info/lang/sl/lang.php + # removed in 2013-04-06 inc/adLDAP.php inc/auth/ad.class.php -- cgit v1.2.3