summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |
| * fix comment errors, sp. & grammarChristopher Smith2014-03-12
| |
| * code styling - add missing bracesChristopher Smith2014-03-12
| |
| * 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.
| * Restore correct public interface of getUserData() for authldapChristopher Smith2014-03-12
| | | | | | | | | | | | | | plugin The outer/public getUserData() implemented as a wrapper for the previous fn which is now protected.
* | 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 unit test for is_ssl()Enrico Tagliavini2014-07-12
| | | | | | | | | | | | | | | | | | | | this should test the correctness of the return value of is_ssl() function based on various combinations of PHP environment variables
| * | | 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
| | | | |
* | | | | Merge pull request #822 from jurrehart/Issue#637Andreas Gohr2014-09-26
|\ \ \ \ \ | | | | | | | | | | | | Added @ALL handeling in auth_isMember
| * | | | | Added @ALL handeling in auth_isMemberJurgen Hart2014-07-30
| | | | | |
* | | | | | Merge pull request #867 from dokuwiki-translate/lang_update_41Andreas Gohr2014-09-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (fr)
| * | | | | | translation updateSyl2014-09-23
|/ / / / / /
* | | | | | Merge pull request #866 from dokuwiki-translate/lang_update_40Andreas Gohr2014-09-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (ar)
| * | | | | | translation updateMohamed Belhsine2014-09-22
|/ / / / / /
* | | | | | Merge pull request #864 from dokuwiki-translate/lang_update_37Andreas Gohr2014-09-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (cs)
| * | | | | | translation updateJaroslav Lichtblau2014-09-20
|/ / / / / /
* | | | | | Merge pull request #862 from dokuwiki-translate/lang_update_26Andreas Gohr2014-09-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (de)
| * | | | | | translation updateMarcel Eickhoff2014-09-19
|/ / / / / /
* | | | | | Merge pull request #861 from dokuwiki-translate/lang_update_25Andreas Gohr2014-09-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (hr)
| * | | | | | translation updateDavor Turkalj2014-09-19
|/ / / / / /
* | | | | | Merge pull request #859 from dokuwiki-translate/lang_update_24Andreas Gohr2014-09-17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (fr)
| * | | | | | translation updateSchplurtz le Déboulonné2014-09-17
|/ / / / / /
* | | | | | Merge pull request #857 from dokuwiki-translate/lang_update_20Andreas Gohr2014-09-15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (zh-tw)
| * | | | | | translation updateJune-Hao Hou2014-09-13
| | | | | | |
* | | | | | | Merge pull request #858 from dokuwiki-translate/lang_update_23Andreas Gohr2014-09-15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Translation update (cs)
| * | | | | | translation updateViktor Zavadil2014-09-15
|/ / / / / /
* | | | | | Merge pull request #854 from dokuwiki-translate/lang_update_17Andreas Gohr2014-09-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (hr)
| * | | | | | translation updateDavor Turkalj2014-09-10
|/ / / / / /
* | | | | | Merge pull request #851 from dokuwiki-translate/lang_update_12Andreas Gohr2014-09-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (hr)
| * | | | | | translation updateDavor Turkalj2014-09-08
| | | | | | |
* | | | | | | Merge pull request #853 from dokuwiki-translate/lang_update_16Andreas Gohr2014-09-10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Translation update (fa)
| * | | | | | translation updateMohamad Mehdi Habibi2014-09-10
|/ / / / / /
* | | | | | Merge pull request #850 from Grahack/patch-1Andreas Gohr2014-09-04
|\ \ \ \ \ \ | | | | | | | | | | | | | | fr/newpage.txt: translation suggestion
| * | | | | | fr/newpage.txt: translation suggestionProf Gra2014-09-03
|/ / / / / / | | | | | | | | | | | | autorisations suffisants -> permissions suffisantes
* | | | | | Merge remote-tracking branch 'origin/master'Gerrit Uitslag2014-09-01
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #844 from dokuwiki-translate/lang_update_155Andreas Gohr2014-08-28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Translation update (es)
| | * | | | | | translation updatepokesakura2014-08-28
| |/ / / / / /
| * | | | | | Merge pull request #843 from dokuwiki-translate/lang_update_153Andreas Gohr2014-08-27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Translation update (pt-br)
| | * | | | | | translation updateFelipe Castro2014-08-27
| |/ / / / / /
| * | | | | | Merge pull request #837 from dokuwiki-translate/lang_update_140Andreas Gohr2014-08-18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Translation update (fa)
| | * | | | | | translation updateHamid2014-08-18
| |/ / / / / /
| * | | | | | sanity check update messageAndreas Gohr2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should avoid problems when a WiFi login redirect intercepts the update check. See https://forum.dokuwiki.org/post/45076
| * | | | | | Merge pull request #834 from dokuwiki-translate/lang_update_132Dominik Eckelmann2014-08-09
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Translation update (it)