summaryrefslogtreecommitdiff
path: root/lib/plugins/config/settings
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'janschumann/master' into futureAndreas Gohr2012-10-06
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge fixes all conflicts but is otherwise untested and might break funktionality in the auth system somewhere. It NEEDS MAJOR TESTING! Some refactoring of the auth plugins is still needed: * move to PHP5 style * fix comments * add plugin.info.txt * janschumann/master: Refactored auth system: All auth methods are now introduced as plugins. Bugfix: auth types are now correcty added Setup auth system from plugins Added Auth-Plugin-Prototype to autoload Load auth types from plugins in settings_authtype class Added prototype for Auth-Plugins added plugin type 'auth' Conflicts: inc/auth.php inc/auth/pgsql.class.php inc/init.php inc/load.php lib/plugins/auth.php lib/plugins/authad/auth.php lib/plugins/authldap/auth.php lib/plugins/authmysql/auth.php lib/plugins/authplain/auth.php
| * Refactored auth system: All auth methods are now introduced as plugins.Jan Schumann2012-02-20
| |
| * Bugfix: auth types are now correcty addedJan Schumann2012-01-03
| |
| * Load auth types from plugins in settings_authtype classJan Schumann2012-01-03
| |
* | replace deprecated split calls FS#2583Andreas Gohr2012-08-26
| |
* | no longer allow include statements in local.conf.phpAndreas Gohr2012-07-08
| | | | | | | | as discussed at https://github.com/splitbrain/dokuwiki/pull/115
* | xml compatibility fixes (mainly entities to unicode conversions)Anika Henke2012-07-05
| |
* | added option to disable reverse DNS lookupsAndreas Gohr2012-04-23
| |
* | Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | rearranged the config optionsAndreas Gohr2012-04-15
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Merge branch 'master' of https://github.com/splitbrain/dokuwikiDominik Eckelmann2012-03-14
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/exe/xmlrpc.php
| | * | make RSS contents (media/pages) configurableAndreas Gohr2012-03-02
| | | |
| | * | Merge pull request #58 from splitbrain/bcryptAndreas Gohr2012-02-01
| | |\ \ | | | | | | | | | | Added bcrypt support for password hashes
| | | * \ Merge branch 'lmd5' into bcryptAndreas Gohr2011-11-27
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/plugins/config/settings/config.metadata.php
| | | | * | renamed passhash method smd6 to lsmd5Andreas Gohr2011-11-27
| | | | | |
| | | | * | MD5 password hash format of the LDAP RFC FS#2378Patrick Michel2011-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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}".
| | | * | | Merge branch 'master' into bcryptAndreas Gohr2011-11-27
| | | |\| |
| | | * | | Added bcrypt support for password hashesAndreas Gohr2011-10-14
| | | | | | | | | | | | | | | | | | | | | | | | This method require PHP 5.3+ it will fail otherwise!
| | * | | | some more DOKU_TPL removalAndreas Gohr2012-02-01
| | | | | |
| | * | | | added two new config options: tagline and sidebarAnika Henke2012-01-29
| | | |_|/ | | |/| | | | | | | | | | | | 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.
| | * | | added missing config metadata FS#2383Andreas Gohr2011-11-27
| | | |/ | | |/| | | | | | | | | Translators need to add another string.
| * / | removed xmlrpc and xmlrpcuser - added remote and remoteuser config optionDominik Eckelmann2012-01-08
| |/ /
* / / made it possible to disable HTML mails in the configAndreas Gohr2012-04-15
|/ /
* / Fixes FS#2323 Symbolic link to template doesn't workHakan Sandell2011-10-15
|/ | | | patch by Chris Green
* Merge pull request #19 from gbirke/masterDominik Eckelmann2011-08-18
|\ | | | | Make cookie path configurable
| * Modified config and lang files for new optionGabriel Birke2010-12-30
| |
* | Made the maximum embed size for datauris configurableAndreas Gohr2011-06-18
| | | | | | | | | | The feature is now disabled by default. Metadata for config manager was added.
* | config manager: always write back to the last fileAndreas Gohr2011-06-16
| | | | | | | | in the local config cascade tree
* | replace tokenizer_cmd with action hookAndreas Gohr2011-03-19
| | | | | | | | | | as discussed at http://www.freelists.org/post/dokuwiki/tokenizer-cmd-in-indexer,1
* | Merge branch 'master' into indexer_rewriteMichael Hamann2011-02-24
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
| * | added 'register' and 'resendpwd' to action links and buttonsAnika Henke2011-02-20
| | | | | | | | | | | | | | | Attention: $lang['register'] has been renamed to $lang['btn_register'], anyone using that in any plugin or template should adjust it.
* | | Merge branch 'master' into indexer_improvementsMichael Hamann2011-01-23
|\| | | | | | | | | | | | | | | | | | | | Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
| * | Added hmd5 and pmd5 as passcrypt choices in config managerAndreas Gohr2011-01-15
| | |
| * | Allow a prefix for subject of sent mails (Close FS#2021)Guy Brand2010-12-31
| |/
| * added security warning to fullpath config option (FS#2113)Anika Henke2010-12-06
| |
| * Allow spaces in numeric configuration valuesMichael Hamann2010-11-30
| |
| * Revert "Fix for $conf['breadcrumbs'] < 0, FS#2107", new fixMichael Hamann2010-11-30
| | | | | | | | | | | | | | 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.
| * Added min and max options for configuration metadataMichael Hamann2010-11-30
| |
* | Use external program to split pages into wordsTom N Harris2010-11-16
|/ | | | | | | | | An external tokenizer inserts extra spaces to mark words in the input text. The text is sent through STDIN and STDOUT file handles. A good choice for Chinese and Japanese is MeCab. http://sourceforge.net/projects/mecab/ With the command line 'mecab -O wakati'
* allow empty values for emails in config manager FS#2012Andreas Gohr2010-08-27
|
* added proxy exception regexp FS#1247Andreas Gohr2010-06-26
|
* Do not output trailing whitespace in conf/local.phpAdrian Lang2010-06-18
|
* new fnencode option FS#1649Andreas Gohr2010-04-04
| | | | | | 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).
* Limiting use of readdir in the idx_indexLengths function (v2).YoBoY2010-03-24
| | | | | | 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.
* Merge branch 'requireall'Andreas Gohr2010-03-12
|\ | | | | | | | | Conflicts: inc/fulltext.php
| * plugin related autoloadingAndreas Gohr2010-02-01
| | | | | | | | | | This patch moved the place where DOKU_PLUGIN is defined. It no longer can be set from a normal config (only via preload)
* | fixed "numericopt" handling in plugin:configKazutaka Miyasaka2010-02-03
|/
* Update translations for subscriptionAdrian Lang2010-01-27
|
* Add subscribe time to admin interface.Adrian Lang2010-01-20
|