Merge branch 'master' into htmlmail

* master:
extended some config options a bit, to make more clear what they do
rearranged the config options

Conflicts:
conf/dokuwiki.php
lib/plugins/config

Merge branch 'master' into htmlmail

* master:
extended some config options a bit, to make more clear what they do
rearranged the config options

Conflicts:
conf/dokuwiki.php
lib/plugins/config/lang/en/lang.php
lib/plugins/config/settings/config.metadata.php

show more ...

rearranged the config options

We had a lot of options lumped together under "Advanced Settings". I
introduced two more categories and move a few options to other existing
categories.
I also reordere

rearranged the config options

We had a lot of options lumped together under "Advanced Settings". I
introduced two more categories and move a few options to other existing
categories.
I also reordered the appropriate entries in the source files to make it
easier to find stuff when extending the options.

show more ...

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they s

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...

Conflicts:
inc/auth.php
inc/load.php

show more ...

made it possible to disable HTML mails in the config

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

Conflicts:
lib/exe/xmlrpc.php

make RSS contents (media/pages) configurable

Merge pull request #58 from splitbrain/bcrypt

Added bcrypt support for password hashes

added two new config options: tagline and sidebar

Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for

added two new config options: tagline and sidebar

Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible.

show more ...

removed xmlrpc and xmlrpcuser - added remote and remoteuser config option

added missing config metadata FS#2383

Translators need to add another string.

Merge branch 'lmd5' into bcrypt

Conflicts:
lib/plugins/config/settings/config.metadata.php

renamed passhash method smd6 to lsmd5

MD5 password hash format of the LDAP RFC FS#2378

This implements the salted MD5 password hash format of the LDAP RFC.
The format is quite simple the password, followed by the 8 byte hash in
base64 e

MD5 password hash format of the LDAP RFC FS#2378

This implements the salted MD5 password hash format of the LDAP RFC.
The format is quite simple the password, followed by the 8 byte hash in
base64 encoding, which results in 32 characters, prepended with the
string "{smd5}".

show more ...

Added bcrypt support for password hashes

This method require PHP 5.3+ it will fail otherwise!

Merge pull request #19 from gbirke/master

Make cookie path configurable

Made the maximum embed size for datauris configurable

The feature is now disabled by default.
Metadata for config manager was added.

Added hmd5 and pmd5 as passcrypt choices in config manager

Allow a prefix for subject of sent mails (Close FS#2021)

Modified config and lang files for new option

Revert "Fix for $conf['breadcrumbs'] < 0, FS#2107", new fix

This reverts commit 4871414204799044c31aa2764c4b4ca020e2331d.
Additionally there is a new fix for FS#2107 that doesn't introduce a lot
of

Revert "Fix for $conf['breadcrumbs'] < 0, FS#2107", new fix

This reverts commit 4871414204799044c31aa2764c4b4ca020e2331d.
Additionally there is a new fix for FS#2107 that doesn't introduce a lot
of checks but instead ensures that the configuration option can't be set
to negative values when the configuration manager is used.

show more ...

Added min and max options for configuration metadata

added proxy exception regexp FS#1247

new fnencode option FS#1649

This patch adds an option to choose how filenames are encoded
when saved to the file system. You can choose between urlencoding
(url), the new SafeFn method (safe) and st

new fnencode option FS#1649

This patch adds an option to choose how filenames are encoded
when saved to the file system. You can choose between urlencoding
(url), the new SafeFn method (safe) and storing real UTF-8 (utf-8).

show more ...

Limiting use of readdir in the idx_indexLengths function (v2).

Each searches on the wiki use this function. Scanning the index directory eachtime is time consuming with a constant series of disk acc

Limiting use of readdir in the idx_indexLengths function (v2).

Each searches on the wiki use this function. Scanning the index directory eachtime is time consuming with a constant series of disk access.
Switching a normal search to use file_exists 1 or more times, and not readdir all the directory.
Switching a wildcard search to use a lengths.idx file containing all the word lengths used in the wiki, file generated if a new configuration parameter $conf[readdircache] is not 0 and fixed to a time in second. Creation of a new function idx_listIndexLengths to do this part.

show more ...

Update translations for subscription