because we actually want it in this branch ;-)

This reverts commit 38a2174b.

this was an accidental commit to master

This reverts commit f7f7fb6c.

This introduces a mechanism to override what happens when a media item
is selected in the media manager popup by providing a callback name in
the URL. The default implementation just does what
dw_mediamanager.insert did before and calls insertTags()

As discussed in #1471, an uninitialized variable will always be
implicitly created when passed to the blank() function. Calling isset()
is thus a no-op. A warning about this behavior has been added to the
function comment.

Adapt .htaccess files for Apache 2.4

for possible upcoming refactoring

Translation update (fa)

Translation update (es)

Disable/enable user editing of AD display name or email address

Translation update (fa)

do not accept empty or root $base in search. fixes #1452

Fixed undefined offset in fulltext search

Undefined offset, initialize as null

Fixed undefined errors

Pass URL query through SSL proxy

Fix behavior when zlib is not available

implements a router for the PHP builtin webserver

You really never want to search the whole filesystem, so something must
have gone wrong. Better abort than go on.

The opening tag of the button was self closing, creating invalid HTML.

See https://forum.dokuwiki.org/thread/13346 for initial report

* master: (29 commits)
  translation update
  Remaining plugin translations for Welsh (cy)
  Partial Plugin Translation for Welsh
  translation update
  translation update
  Translation of main php lang file: CY
  translation update
  Translation files
  Translation files
  Translation 2
  Translation
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  PHP 7 is no longer allowed to fail
  Fixed bug in obtainLock(), where it always fails to verify the lock. This fixes #1019, fixes #1311
  translation update
  ...

Conflicts:
	.travis.yml

Translation update (ru)

Welsh translation (cy) of lang files

Plugin translation #1

Translation update (nl)

Translation update (uk)

Translation update (fa)

Just translation of lang array items in inc/lang main php file

Translation update (sk)