summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #624 from lisps/revisionsAndreas Gohr2014-09-29
|\ | | | | date_at support
| * parse AT parameter: first strtotime then timestamplisps2014-09-29
| | | | | | | | remove config option
| * fix scrutinizer issueslisps2014-09-26
| |
| * Merge remote-tracking branch master into revisionslisps2014-09-26
| |\
| * | fix config optionlisps2014-03-19
| | |
| * | add config date_at_formatlisps2014-03-19
| | | | | | | | | change translation message
| * | Merge remote-tracking branch 'remotes/origin/master' into revisions_locallisps2014-03-19
| |\ \
| * | | add missing parameterlisps2014-02-22
| | | |
| * | | fix check link existence, have to call getLastRevisionAt for every linklisps2014-02-22
| | | |
| * | | check link existencelisps2014-02-20
| | | |
| * | | rename classnamelisps2014-02-17
| | | |
| * | | fix last mergelisps2014-02-17
| | | |
| * | | Merge remote-tracking branch 'origin/diff_navigation' into revisionslisps2014-02-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php
| * \ \ \ Merge branch 'splitbrain/diff_navigation' into revisionslisps2013-11-27
| |\ \ \ \
| * | | | | change behavior only on date_atlisps2013-11-25
| | | | | |
| * | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisionslisps2013-11-25
| |\ \ \ \ \
| * | | | | | add test for empty rev in ml() and wl()lisps2013-11-22
| | | | | | |
| * | | | | | rename function _getProperMediaRevision to _getLastMediaRevisionAtlisps2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce a bit duplicated code
| * | | | | | restore old version of pageinfo()lisps2013-11-22
| | | | | | |
| * | | | | | localize msglisps2013-11-22
| | | | | | |
| * | | | | | add test getlastrevisionatlisps2013-11-22
| | | | | | |
| * | | | | | fix function name media_isexternal()lisps2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove empty rev from ml() rename getProperRevision() to getLastRevisionAt() make getLastRevisionAt() a method of ChangeLog
| * | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisionslisps2013-11-22
| |\ \ \ \ \ \
| * | | | | | | remove property rev from xhtml.phplisps2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed variable name $create_time to $modified_time
| * | | | | | | add parameter at($DATE_AT) and mind revisionslisps2013-11-21
| | | | | | | |
* | | | | | | | Merge pull request #563 from splitbrain/FS#2697searchpagereadonlyAndreas Gohr2014-09-29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update text above searchresults, when only read-acl FS#2697
| * | | | | | | | move more strings to lang.phpGerrit Uitslag2014-09-28
| | | | | | | | |
| * | | | | | | | move strings to lang.phpGerrit Uitslag2014-09-28
| | | | | | | | |
| * | | | | | | | add placeholders for create page textGerrit Uitslag2014-09-28
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonlyGerrit Uitslag2014-09-28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt
| * | | | | | | | | Replace part of localized searchtext by placeholderGerrit Uitslag2014-03-04
| | | | | | | | | |
| * | | | | | | | | use correct permission level for showing 'create page' textGerrit Uitslag2014-03-04
| | | | | | | | | |
| * | | | | | | | | Update text above searchresults, when only read-acl FS#2697Gerrit Uitslag2014-02-21
| | | | | | | | | |
* | | | | | | | | | Merge branch 'bug865'Andreas Gohr2014-09-29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug865: work around missing gzopen on certain systems #865
| * | | | | | | | | | work around missing gzopen on certain systems #865Andreas Gohr2014-09-27
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | postgresql auth plugin: correct function nameChristopher Smith2014-09-29
|/ / / / / / / / /
* | | | | | | | | Merge pull request #826 from splitbrain/external-video-audioAndreas Gohr2014-09-27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added support for external video and audio files
| * | | | | | | | | fixed scrutinizer issuesAnika Henke2014-08-02
| | | | | | | | | |
| * | | | | | | | | added support for external video and audio files, also added return param to ↵Anika Henke2014-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | externalmedia()
* | | | | | | | | | Merge pull request #869 from splitbrain/filterAndreas Gohr2014-09-27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | added filter method to INPUT class
| * | | | | | | | | | fixed typos in docblock commentsAndreas Gohr2014-09-26
| | | | | | | | | | |
| * | | | | | | | | | added filter method to INPUT classAndreas Gohr2014-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the filter() function can be chained between the accessor and the value function to get a filtered value. When no filter allable is given in the filter() function, stripctl() is used to strip all control chars (ASCII<32) Examples: $INPUT->post->filter()->str('foobar'); $INPUT->get->filter('myfilter')->int('baz');
* | | | | | | | | | | Merge pull request #868 from splitbrain/authcleanAndreas Gohr2014-09-27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | clean user credentials from control chars
| * | | | | | | | | | | do not allow empty passwordsAndreas Gohr2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a username but no password is submitted, the login is denied right away instead of relying on the backend to refuse the login.
| * | | | | | | | | | | clean user credentials from control charsAndreas Gohr2014-09-23
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prevent zero byte attacks on external auth systems as described in http://www.freelists.org/post/dokuwiki/Fwd-Dokuwiki-maybe-security-issue-Null-byte-poisoning-in-LDAP-authentication
* | | | | | | | | | | Merge pull request #828 from ssahara/extension-make_infoAndreas Gohr2014-09-27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Last Update Date info of extension fix
| * | | | | | | | | | | Last Update Date info of extension fixSatoshi Sahara2014-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This request makes "Your last update" of the extension info shown when clicking more info triangle mark. The first installed date of the extension may not be necessary for local site admin work.
* | | | | | | | | | | | Merge pull request #870 from dokuwiki-translate/lang_update_46Andreas Gohr2014-09-27
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Translation update (zh)
| * | | | | | | | | | | translation updateYuwei Sun2014-09-26
|/ / / / / / / / / / /
* | | | | | | | | | | Merge remote-tracking branch 'origin/auth_getUserData_improvements'Andreas Gohr2014-09-26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/auth_getUserData_improvements: KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace with boolean values use $requireGroups constants in auth classes; comments; code improvements fix comment errors, sp. & grammar code styling - add missing braces Allow user info to be retrieved without groups Restore correct public interface of getUserData() for authldap plugin Conflicts: inc/common.php