Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #799 from enricotagliavini/master | Andreas Gohr | 2014-09-26 |
|\ | | | | | Adding X-Forwarded-Proto support | ||
| * | Adding unit test for is_ssl() | Enrico Tagliavini | 2014-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 Tagliavini | 2014-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 Gohr | 2014-09-26 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * origin/pr/814: translation update Conflicts: inc/lang/ta/lang.php | ||
| * | | translation update | Naveen Venugopal | 2014-07-26 |
| | | | |||
* | | | Merge pull request #822 from jurrehart/Issue#637 | Andreas Gohr | 2014-09-26 |
|\ \ \ | | | | | | | | | Added @ALL handeling in auth_isMember | ||
| * | | | Added @ALL handeling in auth_isMember | Jurgen Hart | 2014-07-30 |
| | | | | |||
* | | | | Merge pull request #867 from dokuwiki-translate/lang_update_41 | Andreas Gohr | 2014-09-23 |
|\ \ \ \ | | | | | | | | | | | Translation update (fr) | ||
| * | | | | translation update | Syl | 2014-09-23 |
|/ / / / | |||
* | | | | Merge pull request #866 from dokuwiki-translate/lang_update_40 | Andreas Gohr | 2014-09-22 |
|\ \ \ \ | | | | | | | | | | | Translation update (ar) | ||
| * | | | | translation update | Mohamed Belhsine | 2014-09-22 |
|/ / / / | |||
* | | | | Merge pull request #864 from dokuwiki-translate/lang_update_37 | Andreas Gohr | 2014-09-22 |
|\ \ \ \ | | | | | | | | | | | Translation update (cs) | ||
| * | | | | translation update | Jaroslav Lichtblau | 2014-09-20 |
|/ / / / | |||
* | | | | Merge pull request #862 from dokuwiki-translate/lang_update_26 | Andreas Gohr | 2014-09-19 |
|\ \ \ \ | | | | | | | | | | | Translation update (de) | ||
| * | | | | translation update | Marcel Eickhoff | 2014-09-19 |
|/ / / / | |||
* | | | | Merge pull request #861 from dokuwiki-translate/lang_update_25 | Andreas Gohr | 2014-09-19 |
|\ \ \ \ | | | | | | | | | | | Translation update (hr) | ||
| * | | | | translation update | Davor Turkalj | 2014-09-19 |
|/ / / / | |||
* | | | | Merge pull request #859 from dokuwiki-translate/lang_update_24 | Andreas Gohr | 2014-09-17 |
|\ \ \ \ | | | | | | | | | | | Translation update (fr) | ||
| * | | | | translation update | Schplurtz le Déboulonné | 2014-09-17 |
|/ / / / | |||
* | | | | Merge pull request #857 from dokuwiki-translate/lang_update_20 | Andreas Gohr | 2014-09-15 |
|\ \ \ \ | | | | | | | | | | | Translation update (zh-tw) | ||
| * | | | | translation update | June-Hao Hou | 2014-09-13 |
| | | | | | |||
* | | | | | Merge pull request #858 from dokuwiki-translate/lang_update_23 | Andreas Gohr | 2014-09-15 |
|\ \ \ \ \ | |/ / / / |/| | | | | Translation update (cs) | ||
| * | | | | translation update | Viktor Zavadil | 2014-09-15 |
|/ / / / | |||
* | | | | Merge pull request #854 from dokuwiki-translate/lang_update_17 | Andreas Gohr | 2014-09-10 |
|\ \ \ \ | | | | | | | | | | | Translation update (hr) | ||
| * | | | | translation update | Davor Turkalj | 2014-09-10 |
|/ / / / | |||
* | | | | Merge pull request #851 from dokuwiki-translate/lang_update_12 | Andreas Gohr | 2014-09-10 |
|\ \ \ \ | | | | | | | | | | | Translation update (hr) | ||
| * | | | | translation update | Davor Turkalj | 2014-09-08 |
| | | | | | |||
* | | | | | Merge pull request #853 from dokuwiki-translate/lang_update_16 | Andreas Gohr | 2014-09-10 |
|\ \ \ \ \ | |/ / / / |/| | | | | Translation update (fa) | ||
| * | | | | translation update | Mohamad Mehdi Habibi | 2014-09-10 |
|/ / / / | |||
* | | | | Merge pull request #850 from Grahack/patch-1 | Andreas Gohr | 2014-09-04 |
|\ \ \ \ | | | | | | | | | | | fr/newpage.txt: translation suggestion | ||
| * | | | | fr/newpage.txt: translation suggestion | Prof Gra | 2014-09-03 |
|/ / / / | | | | | | | | | autorisations suffisants -> permissions suffisantes | ||
* | | | | Merge remote-tracking branch 'origin/master' | Gerrit Uitslag | 2014-09-01 |
|\ \ \ \ | |||
| * \ \ \ | Merge pull request #844 from dokuwiki-translate/lang_update_155 | Andreas Gohr | 2014-08-28 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (es) | ||
| | * | | | | translation update | pokesakura | 2014-08-28 |
| |/ / / / | |||
| * | | | | Merge pull request #843 from dokuwiki-translate/lang_update_153 | Andreas Gohr | 2014-08-27 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (pt-br) | ||
| | * | | | | translation update | Felipe Castro | 2014-08-27 |
| |/ / / / | |||
| * | | | | Merge pull request #837 from dokuwiki-translate/lang_update_140 | Andreas Gohr | 2014-08-18 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (fa) | ||
| | * | | | | translation update | Hamid | 2014-08-18 |
| |/ / / / | |||
| * | | | | sanity check update message | Andreas Gohr | 2014-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_132 | Dominik Eckelmann | 2014-08-09 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (it) | ||
| | * | | | | translation update | Fabio | 2014-08-09 |
| |/ / / / | |||
| * | | | | Merge pull request #831 from dokuwiki-translate/lang_update_127 | Andreas Gohr | 2014-08-07 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (ru) | ||
| | * | | | | translation update | Igor Degraf | 2014-08-07 |
| | | | | | | |||
| * | | | | | Merge pull request #832 from dokuwiki-translate/lang_update_128 | Andreas Gohr | 2014-08-07 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Translation update (ru) | ||
| | * | | | | translation update | Igor Degraf | 2014-08-07 |
| |/ / / / | |||
| * | | | | Merge pull request #827 from splitbrain/canonical-root | Anika Henke | 2014-08-03 |
| |\ \ \ \ | | | | | | | | | | | | | Set canonical URL to root when on start page | ||
| | * | | | | set canonical URL to root when on start page | Anika Henke | 2014-08-02 |
| |/ / / / | |||
| * | | | | updated dates in info.txt of various plugins and template | Anika Henke | 2014-08-02 |
| | | | | | |||
| * | | | | Merge pull request #825 from dokuwiki-translate/lang_update_123 | Andreas Gohr | 2014-08-02 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (zh-tw) | ||
| | * | | | | translation update | Stan | 2014-08-02 |
| |/ / / / |