| Commit message (Collapse) | Author | Age |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
|
| |
summary field.
This allows easier identifying of which version has been restored. (FS#2522)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
| |
Attention: $lang['register'] has been renamed to $lang['btn_register'],
anyone using that in any plugin or template should adjust it.
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
inc/lang/de-informal/lang.php
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
| |
|
|
|
|
|
|
|
|
| |
besides via Save or Preview button. This has been successfully tested in FF,
Chrome and IE6/7/8. Opera does not support onbeforeunload, therefore the draft
is kept if the user navigates away from the editor.
Please test this.
|
| |
|
| |
|
| |
|
| |
|
|
Ignore-this: ae145212697afcd073253bd16030f0ab
darcs-hash:20091003093754-380d8-81f53376aa639b3826b376e69bf7f194c048f7fe.gz
|