| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
as discussed at https://github.com/splitbrain/dokuwiki/pull/115
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
lib/exe/xmlrpc.php
|
| | | | |
|
| | |\ \
| | | | |
| | | | | |
Added bcrypt support for password hashes
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
lib/plugins/config/settings/config.metadata.php
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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}".
|
| | | |\| | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This method require PHP 5.3+ it will fail otherwise!
|
| | | | | | |
|
| | | |_|/
| | |/| |
| | | | |
| | | | | |
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.
|
| | | |/
| | |/|
| | | |
| | | | |
Translators need to add another string.
|
| |/ / |
|
|/ / |
|
|/
|
|
| |
patch by Chris Green
|
|\
| |
| | |
Make cookie path configurable
|
| | |
|
| |
| |
| |
| |
| | |
The feature is now disabled by default.
Metadata for config manager was added.
|
| |
| |
| |
| | |
in the local config cascade tree
|
| |
| |
| |
| |
| | |
as discussed at
http://www.freelists.org/post/dokuwiki/tokenizer-cmd-in-indexer,1
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
|
| | |
| | |
| | |
| | |
| | | |
Attention: $lang['register'] has been renamed to $lang['btn_register'],
anyone using that in any plugin or template should adjust it.
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
|/
|
|
|
|
|
|
|
| |
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'
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
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).
|
|
|
|
|
|
| |
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.
|
|\
| |
| |
| |
| | |
Conflicts:
inc/fulltext.php
|
| |
| |
| |
| |
| | |
This patch moved the place where DOKU_PLUGIN is defined. It no longer
can be set from a normal config (only via preload)
|
|/ |
|
| |
|
| |
|