Merge branch 'master' into emailsignature

* master: (406 commits)
msglint is HTTPS now. fixed failing tests
URI scheme is only relevant for TLS if not proxy connection #1526
use SSL if scheme

Merge branch 'master' into emailsignature

* master: (406 commits)
msglint is HTTPS now. fixed failing tests
URI scheme is only relevant for TLS if not proxy connection #1526
use SSL if scheme is https
add conf as global
translation update
avoid HTTP Response Splitting attacks via redirects #1513
translation update
another tiny tab CSS addition
minor change to make tabs more flexible
translation update
adjusted for scrutinizer hints
adjusted tests for reflection based method export
first go at using reflection for remote export
Fixes for the FR translation
obfuscate auth passwords in config. fixes #1487
add support for new Django hashing methods
usie a strict comparison === instead
use getNS() call instead of dirname()
#1477:Search heading still displayed although search disabled
Fix PHP7 evaluation order incompatibility
...

show more ...

translation update

translation update

fixed lots of missing format strings in language files

Remove no longer needed language string

Remove unused language strings

translation update

Cleanup of the mail text signature.

Done:
Cleanup of the mail text signature.
The signature is deleted from the txt files and moved in to lang.php
Mailer.class.php updated to insert the signature

F

Cleanup of the mail text signature.

Done:
Cleanup of the mail text signature.
The signature is deleted from the txt files and moved in to lang.php
Mailer.class.php updated to insert the signature

Fix:
- Cleaner text
- no more "-- " "--" "---" "----" problems.
- mailwrap.html is not needed anymore an can be deleted (?)

Changed files in all languages:
lang.php
mailtext.txt
password.txt
registermail.txt
subscr_digest.txt
subscr_list.txt
subscr_single.txt
uploadmail.txt
pwconfirm.txt
showrev.txt

delete?:
mailwrap.html

show more ...

translation update

move strings to lang.php

Merge remote-tracking branch 'origin/master' into trailingcolons

Conflicts:
inc/lang/lv/lang.php
inc/lang/pt/lang.php

translation update

translation update

Move colon from code to language strings

Update lang of img pagetools

removed unused lang string (authmodfailed)

translation update

fixed language file placeholders FS#2682

Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into pull-request-118

* 'guide' of git://github.com/splitbrain/dokuwiki:
changed semicolon to colon in link to welcome page to make it

Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into pull-request-118

* 'guide' of git://github.com/splitbrain/dokuwiki:
changed semicolon to colon in link to welcome page to make it less confusing
added initial pages to not be ignored by git
improved welcome text
added welcome page
changed the link in the installer to point to wiki:welcome

Conflicts:
inc/lang/fr/lang.php

show more ...

changed semicolon to colon in link to welcome page to make it less confusing

Use hardcoded plugin loading error message as $lang isn't initialized

When loading plugins, $lang might not be initialized yet, so use a
hardcoded error message instead, especially as this error sho

Use hardcoded plugin loading error message as $lang isn't initialized

When loading plugins, $lang might not be initialized yet, so use a
hardcoded error message instead, especially as this error should only be
displayed for the admin (and then fixed). This also removes the
previously localized message, it might be re-added as part of the new
extension manager.

show more ...

changed the link in the installer to point to wiki:welcome

Merge branch 'resetpassword'

No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.

* resetpassword:
added a timeli

Merge branch 'resetpassword'

No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.

* resetpassword:
added a timelimit for password reset tokens
removed commented line
use correct lang string for password mismatch
removed outdated language string. it has to be retranslated
German translation for password reset
honor autopasswd setting for resend password

Conflicts:
inc/lang/no/lang.php
inc/lang/sl/lang.php

show more ...

removed outdated language string. it has to be retranslated

localization: removed strings from old flashuploader