Commit Graph

9120 Commits

Author SHA1 Message Date
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
Gerry Weißbach 6d3bebff6f Add Event to modify the list of javascript files before they are processed. This allows plugins to not have their - or other plugins - script delivered to the client. Creating the list of files upfront might add a little overhead which I think is OK when you can be certain that only JavaScript that really is needed will be delivered to the client.
Multiple Javascript requests, e.g. to only send the jQuery part or just editor/administrator scripts, could be implemented with this modification (I know, jQuery has already been split).
2017-02-08 14:29:07 +01:00
Andreas Gohr 9c5f311580 admin screen: override fill attribute of paths
When an svg has a fill attribute directly on the path, we need more
specifity to override it.
2017-02-08 10:03:02 +01:00
Andreas Gohr efce9e7d15 mysql 4.11+ hash is supposed to be upper case. fixes #1825 2017-02-08 09:53:56 +01:00
Andreas Gohr 32594b01fb send correct mime for local jquery. should fix #1824 2017-02-07 11:45:22 +01:00
Andreas Gohr 8ae450b681 Merge pull request #1823 from dokuwiki-translate/lang_update_258
Translation update (no)
2017-02-07 09:04:38 +01:00
Arne Hanssen 77469eb955 translation update 2017-02-07 08:41:21 +01:00
Andreas Gohr b6f1debda8 optimized SVGs
ran svgo over all the admin svg files to strip all unneeded cruft.
2017-02-06 21:03:58 +01:00
Andreas Gohr d70f846e31 Merge pull request #1820 from dokuwiki-translate/lang_update_256
Translation update (ja)
2017-02-06 10:32:45 +01:00
Satoshi Sahara fafff83c73 translation update 2017-02-06 09:51:33 +01:00
Andreas Gohr 4cd2074f30 fixed typo in function name 2017-02-05 11:06:20 +01:00
Andreas Gohr d2dc1fa3e7 Merge pull request #1817 from dokuwiki-translate/lang_update_255
Translation update (zh)
2017-02-05 10:48:25 +01:00
Andreas Gohr f83f0fd074 support autoloading for templates
similar to what is possible for plugins, templates can now autoload
namespaced classes, too. the namespace is
dokuwiki\template\<templatename>
2017-02-05 07:15:05 +01:00
Andreas Gohr 71de557260 changed embedSVG to inlineSVG and make it return contents
This makes it more flexible to use on the expense of needing one echo
more.
2017-02-05 04:42:37 +01:00
hznupeter 653c4606bc translation update 2017-02-04 13:16:20 +01:00
Andreas Gohr 70635395b7 fix pass by reference bug identified by scrutinizer
$pagelog->getRevisions(-1, 1) cannot be passed to array_pop() as the
parameter $array expects a reference.
2017-02-03 11:23:32 +01:00
Andreas Gohr 2d90435a31 Merge pull request #1507 from ssahara/pageinfo
remove fullpath() call in pageinfo
2017-02-03 11:07:59 +01:00
Andreas Gohr 82be96697e Merge pull request #1602 from metinn/master
added rev number to most recent link in old revisions page
2017-02-03 11:04:36 +01:00
Andreas Gohr 472b5ca14d removed commented out code 2017-02-03 11:00:35 +01:00
Andreas Gohr 56bf57c613 remove unused code 2017-02-03 10:59:31 +01:00
Andreas Gohr 427bf9a2e8 do not deliver scripts to ie<9 fixes #1816
All script tags are now surrounded by conditional comments to tell
Internet Explorer 8 and lower to not even bother trying to load the
JavaScript.
2017-02-03 10:52:39 +01:00
Andreas Gohr 65a6bb072a Merge branch 'jqsplit'
* jqsplit:
  Restore smoothness.css using update.sh
  allow selecting the preferred CDN and add event
  load jquery via https always
  split off jquery from other JS and add CDN option #1766
  use external version file for jquery updates
  removed jQuery.browser calls
  replace deprecated bind() calls
  replace deprecated delegate() calls
  fixed radio options in media manager for new jQ-UI
  jQuery Updates
2017-02-03 10:25:11 +01:00