Commit Graph

9141 Commits

Author SHA1 Message Date
Guy Brand f667b9f6a6 Hotfix Release 2017-02-19c "Frusterick Manners" 2017-08-11 16:32:50 +02:00
Phy 0e609515da Add htmlspecialchars when showing $DATE_AT
Fixes #2061
2017-08-11 16:31:14 +02:00
Guy Brand 3291b907fa Hotfix Release 2017-02-19b "Frusterick Manners" 2017-03-07 21:02:03 +01:00
Guy Brand 8fe0323d47 Merge branch 'master' into stable 2017-03-07 21:00:55 +01:00
Guy Brand bcbb31f435 Release preparation 2017-03-07 20:56:13 +01:00
controlonline.net d22df72d49 translation update 2017-03-07 19:43:02 +01:00
Schplurtz le Déboulonné d072686e48 translation update 2017-03-02 16:10:09 +01:00
Andreas Gohr 6453acd5ff skip empty line when reading jQuery versions. fixes #1886 2017-03-01 10:32:08 +01:00
Andreas Gohr 924e477e18 adjust session ID check to specification
The documentation says sessionIDs are between 22 and 256 chars long. A
quick test only showed 26 chars in common configurations, but this
should cover all possibilities.
2017-03-01 10:26:04 +01:00
Andreas Gohr 6eb3cdf688 do not use invalid session IDs #1883
When an invalid session ID is passed to PHP a warning is thrown, but the
session is still initialized with this invalid ID (throwing additional
warnings on save).

This makes sure such invalid IDs are removed from the cookie array
before initializing the session.

PHP bug references:

https://bugs.php.net/bug.php?id=68063
https://bugs.php.net/bug.php?id=73860
2017-03-01 10:26:04 +01:00
Andreas Gohr 3680e2cdaa do not generate CSRF tokens when no session or user exists
This partly fixes #1883
2017-03-01 10:26:04 +01:00
錢政維 d1264f551b Fixes issue #1864 2017-02-28 18:35:48 +01:00
Gerrit Uitslag 1cb2fd70c2 Merge pull request #1882 from dokuwiki-translate/lang_update_300
Translation update (zh)
2017-02-28 08:43:05 +01:00
phy25 8ff80ee32c translation update 2017-02-28 04:56:20 +01:00
Gerrit Uitslag 0c5fef0c92 Merge pull request #1877 from dokuwiki-translate/lang_update_295
Translation update (zh)
2017-02-27 23:24:12 +01:00
Gerrit Uitslag 9765009d72 Merge pull request #1879 from dokuwiki-translate/lang_update_298
Translation update (nl)
2017-02-27 18:01:48 +01:00
stafmans 799214be34 translation update 2017-02-27 16:16:31 +01:00
kuma 36dccdcd90 translation update 2017-02-25 14:01:12 +01:00
Guy Brand 4074bbe05d Old inc/phpseclib/ has no more files 2017-02-25 00:24:51 +01:00
rnck 2af726d3d5 translation update 2017-02-22 16:14:48 +01:00
controlonline.net aa31d8d0d3 translation update 2017-02-21 14:51:54 +01:00
Guy Brand e349ed8aad "Hotfix Release 2017-02-19a "Frusterick Manners" 2017-02-20 20:41:03 +01:00
Guy Brand 6ad6eeb83a Hotfix merge:
Fix calling undefined function random_int() in install.php (#1852)
  Check for overwrite in media manager (#1853)
2017-02-20 20:37:45 +01:00
Guy Brand 73f84337c2 Hostfix release preparation 2017-02-20 20:37:08 +01:00
Yousong Zhou 02bca5d42d Fix calling undefined function random_int() when doing install.php
Otherwise the it will fail with the following error:

	2017/02/20 14:34:57 [error] 16242#0: *59 FastCGI sent in stderr: "PHP message: PHP Fatal error:  Call to undefined function random_int() in /var/www/dokuwiki/inc/PassHash.class.php on line 630" while reading response header from upstream, client: 172.18.35.245, server: _, request: "POST /dokuwiki/install.php HTTP/1.1", upstream: "fastcgi://unix:/var/run/php-fpm/php-fpm.sock:", host: "10.5.234.170", referrer: "http://10.5.234.170/dokuwiki/install.php"

Fixes #1852
2017-02-20 18:41:08 +01:00
Gerry Weißbach eedb5034dc Check for overwrite in media manager
The check did not work any more. see #1853
2017-02-20 18:23:11 +01:00
Guy Brand 2526206098 Forgot updateVersion inc 2017-02-19 14:15:07 +01:00
Guy Brand 098d5e7376 Release 2017-02-19 "Frusterick Manners" 2017-02-19 14:10:32 +01:00
Guy Brand 670012ad5c Merge branch 'master' into stable 2017-02-19 14:07:55 +01:00
Guy Brand 2f7c97b3eb Release preparation 2017-02-19 14:07:03 +01:00
Andreas Gohr ce8bf5461c fixed mistake in #1847
direction is always ltr for russian
2017-02-18 08:27:20 +01:00
Andreas Gohr 60777f9e1c Merge branch 'lang_update_274' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-1847
* 'lang_update_274' of git://github.com/dokuwiki-translate/dokuwiki:
  translation update
2017-02-18 08:26:41 +01:00
Olivier Humbert 20f1bc50bf translation update 2017-02-18 08:26:14 +01:00
Andreas Gohr 14b73b3182 fixed typo in german lang 2017-02-18 08:25:33 +01:00
Hella Breitkopf 6e0c32d78e translation update 2017-02-17 14:47:17 +01:00
Andreas Gohr 7531aa8178 print stack trace on catched JS errors too 2017-02-17 11:08:51 +01:00
Gerrit Uitslag 2f85bd15e8 Merge pull request #1848 from dokuwiki-translate/lang_update_275
Translation update (nl)
2017-02-17 09:25:12 +01:00
mark prins 8061ba1277 translation update 2017-02-17 09:21:12 +01:00
alexey 2f452d39fa translation update 2017-02-17 09:01:23 +01:00
Marco Hofmann 9fe10ff8be translation update 2017-02-16 23:27:44 +01:00
Andreas Gohr a1ed0b9b19 Merge pull request #1843 from dokuwiki-translate/lang_update_270
Translation update (it)
2017-02-16 18:13:01 +01:00
Paolo 1aa4284e45 translation update 2017-02-16 16:11:35 +01:00
Andreas Gohr a2306df11a Merge pull request #1842 from dokuwiki-translate/lang_update_269
Translation update (de)
2017-02-16 15:56:43 +01:00
Marco Hofmann 935d40e901 translation update 2017-02-16 13:36:28 +01:00
Andreas Gohr 8fd3f88fd5 Merge pull request #1828 from gamma/master
JS modification action
2017-02-14 09:21:49 +01:00
Andreas Gohr 9609631496 Merge pull request #1835 from dokuwiki-translate/lang_update_262
Translation update (fr)
2017-02-14 09:18:23 +01:00
Schplurtz le Déboulonné 46214a2f12 translation update 2017-02-14 06:46:45 +01:00
Andreas Gohr 63ab400a7a Merge pull request #1832 from splitbrain/fixStrictWarnings
Fix strict standard warnings in dropdowns for PHP <=5.6
2017-02-10 16:48:40 +01:00
Michael Grosse 7b6bf7a3e0 Fix strict warnings in optgroups/dropdowns
PHP 5.6 and below throw a strict standards warning at the changed lines.
An intermediate variable is introduced to avoid this warning.

PHP 7+ changes the severity of this warning to E_NOTICE which is
suppressed by DokuWiki.

This error was introduced in #1778
2017-02-10 15:59:05 +01:00
Gerry Weißbach 6ff51f7d23 Spaces, not tabs. 2017-02-08 14:47:45 +01:00