summaryrefslogtreecommitdiff
path: root/inc
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
| |\
| * | 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
| | | |
| * | | 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
| |\ \ \ \ \
| * | | | | | rename function _getProperMediaRevision to _getLastMediaRevisionAtlisps2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce a bit duplicated code
| * | | | | | restore old version of pageinfo()lisps2013-11-22
| | | | | | |
| * | | | | | localize msglisps2013-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
| | | | | | | | | |
* | | | | | | | | | work around missing gzopen on certain systems #865Andreas Gohr2014-09-27
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | 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
* | | | | | | | | | / 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
| * | | | | | | | | | KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace ↵Christopher Smith2014-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with boolean values
| * | | | | | | | | | use $requireGroups constants in auth classes; comments; code improvementsChristopher Smith2014-03-14
| | | | | | | | | | |
| * | | | | | | | | | Allow user info to be retrieved without groupsChristopher Smith2014-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some parts of dokuwiki (e.g. recent changes, old revisions) can requests lots of user info (to provide editor names) without requiring any group information. This change also implements caching of user info by authmysql & authpgsql plugins to avoid repeated querying of the DB to retrieve the same user information.
* | | | | | | | | | | Merge pull request #821 from splitbrain/searchnsAndreas Gohr2014-09-26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | improve qsearch suggestions
| * | | | | | | | | | | improve qsearch suggestionsGerrit Uitslag2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support namespaces with more then one level e.g. @your:namespace * support ns:<ns> as well
* | | | | | | | | | | | Merge pull request #799 from enricotagliavini/masterAndreas Gohr2014-09-26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Adding X-Forwarded-Proto support
| * | | | | | | | | | | | adding X-Forwarded-Proto support in is_ssl()Enrico Tagliavini2014-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for X-Forwarded-Proto in case dokuwiki runs behind a reverse (SSL) proxy, but the connection between the proxy and the web server running dokuwki is plain HTTP. If an authenticated user is accidentaly dropped to HTTP from HTTPS the securecookie setting should be honored and the redirection when saving or canceling a page edit should point to the correct protocol. This happens every time a user hits cancel after editing a page, and likely even after saving. If the webserver doesn't enforce HTTPS the coockie might be sent in clear.
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/pr/814'Andreas Gohr2014-09-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/pr/814: translation update Conflicts: inc/lang/ta/lang.php
| * | | | | | | | | | | | | translation updateNaveen Venugopal2014-07-26
| | | | | | | | | | | | | |