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 ...

do not hardcode profile link in AD pass expire message

Changing passwords might not be available.

added 5 new language strings for action tools and skip link (needs translations)

This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them.

corrected old mediaupload introduction text

localization: removed strings from old flashuploader

translatable AD expiry warning and link to update profile page

honor autopasswd setting for resend password

When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.

Note to

honor autopasswd setting for resend password

When autopasswd is disabled, the resend password option now asks for a
new password instead of autogenerating a new one and sending it by mail.

Note to translators: the wording for btn_resendpwd and resendpwd changed
to be more universal. English and German language files where updated -
other languages need to be adjusted.

Conflicts:

inc/lang/en/lang.php

show more ...

removed remnants of old flash uploader (FS#2335)

Add file revision above file detail page

media manager: renamed List display option to 'Rows'

media manager: shortened text for media list headline

media manager: improved spacing around option buttons and changed lang strings for them

media manager: moved some html out of lang.php and fixed namespace in middle panel

media manager: word changes

Rework media manager HTML (JS and CSS will come)

improved words for different diff views of images

en/fr: language updates (new strings of the Media Manager)

de/de-informal/en language file updates

This commit adds new strings to the de/de-informals files which
have been introduced through the new Media-Manager.

All lang.php-files in inside en/de/de-inf

de/de-informal/en language file updates

This commit adds new strings to the de/de-informals files which
have been introduced through the new Media-Manager.

All lang.php-files in inside en/de/de-informal have been
reordered and reformatted.

show more ...

Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller

This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The c

Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller

This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001

Thanks to Piyush for the work and Google for sponsoring it!

Conflicts:
inc/lang/en/lang.php

show more ...

Code cleanup documentation before merge

Function get_plugin_components() moved to extantion manager

merging

added new plugins config cascade and added plugin.info.txt

issue #44 new uploader in the media popup

jqueryized locktimer

issue #50 styling uploader