Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #708 from splitbrain/overridablelangstrings | Andreas Gohr | 2014-09-29 |
|\ | | | | | extend lang file cascade, so users can override some lang strings | ||
| * | phpdocs parserutils | Gerrit Uitslag | 2014-09-28 |
| | | |||
| * | improve some scrutinizer issues | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | | different types unused vars PHPDocs | ||
| * | Merge remote-tracking branch 'origin/master' into overridablelangstrings | Gerrit Uitslag | 2014-09-28 |
| |\ | | | | | | | | | | | | | Conflicts: inc/plugin.php | ||
| * | | visibility plugin methods | Gerrit Uitslag | 2014-09-28 |
| | | | |||
| * | | use config cascade for loading of localizations | Gerrit Uitslag | 2014-09-28 |
| | | | |||
| * | | reformatting config cascade | Gerrit Uitslag | 2014-09-27 |
| | | | |||
| * | | add lang files to cascading | Gerrit Uitslag | 2014-09-27 |
| | | | |||
| * | | extend lang file cascade, so users can override some lang strings | Gerrit Uitslag | 2014-05-13 |
| | | | | | | | | | | | | Fixes #692 | ||
* | | | Merge pull request #624 from lisps/revisions | Andreas Gohr | 2014-09-29 |
|\ \ \ | | | | | | | | | date_at support | ||
| * | | | parse AT parameter: first strtotime then timestamp | lisps | 2014-09-29 |
| | | | | | | | | | | | | | | | | remove config option | ||
| * | | | fix scrutinizer issues | lisps | 2014-09-26 |
| | | | | |||
| * | | | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
| |\ \ \ | |||
| * | | | | add config date_at_format | lisps | 2014-03-19 |
| | | | | | | | | | | | | | | | change translation message | ||
| * | | | | Merge remote-tracking branch 'remotes/origin/master' into revisions_local | lisps | 2014-03-19 |
| |\ \ \ \ | |||
| * | | | | | add missing parameter | lisps | 2014-02-22 |
| | | | | | | |||
| * | | | | | fix check link existence, have to call getLastRevisionAt for every link | lisps | 2014-02-22 |
| | | | | | | |||
| * | | | | | check link existence | lisps | 2014-02-20 |
| | | | | | | |||
| * | | | | | fix last merge | lisps | 2014-02-17 |
| | | | | | | |||
| * | | | | | Merge remote-tracking branch 'origin/diff_navigation' into revisions | lisps | 2014-02-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * \ \ \ \ \ | Merge branch 'splitbrain/diff_navigation' into revisions | lisps | 2013-11-27 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | change behavior only on date_at | lisps | 2013-11-25 |
| | | | | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions | lisps | 2013-11-25 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | rename function _getProperMediaRevision to _getLastMediaRevisionAt | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce a bit duplicated code | ||
| * | | | | | | | | restore old version of pageinfo() | lisps | 2013-11-22 |
| | | | | | | | | | |||
| * | | | | | | | | localize msg | lisps | 2013-11-22 |
| | | | | | | | | | |||
| * | | | | | | | | fix function name media_isexternal() | lisps | 2013-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 revisions | lisps | 2013-11-22 |
| |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | remove property rev from xhtml.php | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed variable name $create_time to $modified_time | ||
| * | | | | | | | | | add parameter at($DATE_AT) and mind revisions | lisps | 2013-11-21 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #563 from splitbrain/FS#2697searchpagereadonly | Andreas Gohr | 2014-09-29 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update text above searchresults, when only read-acl FS#2697 | ||
| * | | | | | | | | | | move more strings to lang.php | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | move strings to lang.php | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | add placeholders for create page text | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly | Gerrit Uitslag | 2014-09-28 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt | ||
| * | | | | | | | | | | Replace part of localized searchtext by placeholder | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | use correct permission level for showing 'create page' text | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Update text above searchresults, when only read-acl FS#2697 | Gerrit Uitslag | 2014-02-21 |
| | | | | | | | | | | | |||
* | | | | | | | | | | | work around missing gzopen on certain systems #865 | Andreas Gohr | 2014-09-27 |
| |/ / / / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #826 from splitbrain/external-video-audio | Andreas Gohr | 2014-09-27 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added support for external video and audio files | ||
| * | | | | | | | | | | fixed scrutinizer issues | Anika Henke | 2014-08-02 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | added support for external video and audio files, also added return param to ↵ | Anika Henke | 2014-08-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | externalmedia() | ||
* | | | | | | | | | | | Merge pull request #869 from splitbrain/filter | Andreas Gohr | 2014-09-27 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | added filter method to INPUT class | ||
| * | | | | | | | | | | | fixed typos in docblock comments | Andreas Gohr | 2014-09-26 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | added filter method to INPUT class | Andreas Gohr | 2014-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/authclean | Andreas Gohr | 2014-09-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | clean user credentials from control chars | ||
| * | | | | | | | | | | | | do not allow empty passwords | Andreas Gohr | 2014-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 chars | Andreas Gohr | 2014-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 | ||
* | | | | | | | | | / / | translation update | Yuwei Sun | 2014-09-26 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/auth_getUserData_improvements' | Andreas Gohr | 2014-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 |