| 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
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
The link doesn't exist in the English version and it doesn't work
anymore because appending a parameter to a link doesn't work when the
link is not just a URL but an HTML link
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Attention: $lang['register'] has been renamed to $lang['btn_register'],
anyone using that in any plugin or template should adjust it.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Ignore-this: 4c1258e974c6f1c1f05b85c9f2d20525
darcs-hash:20091115121104-e81ea-7708f498b3c5f33dd12d642efb60372fb7f52cf7.gz
|
|
|
|
|
|
| |
Ignore-this: 26c7a4e463f9cd3cf86bbfd1c69491f2
darcs-hash:20091111210040-5b4a8-ba98714b8c1201af7b575619c2a7964b4b50b908.gz
|
|
|
|
|
|
| |
Ignore-this: 27ea52110bce929b2c61ed8faba67cfc
darcs-hash:20091016205526-c0bf4-35eba4e65d37980a667ba982f7f1ea5b7b07f01c.gz
|
|
|
|
|
|
| |
Ignore-this: dc3feb3de04753fafa41009e827cae76
darcs-hash:20091016190032-74baf-82506614818b1d6549ab0798d44b1b1c1e783ca8.gz
|
|
|
|
|
|
| |
Ignore-this: 5276aea0544dc7768b700fb4e3b2797
darcs-hash:20090920164323-2ae76-208ecb455190a9d6f060476d9edc14e347546c14.gz
|
|
|
|
|
|
|
|
| |
Ignore-this: 7c8f68f29f52bc1d33fdb76ba98d2307
Removed unused string, move another string to the [js] subarray.
darcs-hash:20090812191138-6e07b-65db1b7560d437fb26a1a4d0095cd768b2c9af01.gz
|
|
|
|
|
|
| |
Ignore-this: 3c16a0a7483f35e9026c7e292c926453
darcs-hash:20090811185014-e81ea-4cbbce2d5ebde7e00a0250589a41666ad5dfbb19.gz
|
|
|
|
|
|
| |
Ignore-this: fef986ab0381d7552bd02a72b55d250e
darcs-hash:20090708174300-594cd-249bf049ecc6cdd21d8bb2cc99e6560570b83747.gz
|
|
|
|
|
|
| |
Ignore-this: 52358f90550c48371573f4a07d8dc094
darcs-hash:20090630192957-74baf-bd72eb881db0af795ebee4d9b5b608baabef8835.gz
|
|
|
|
| |
darcs-hash:20090525194435-f7d6d-2def694a053f7e661f88f1636903283bad7c1fa8.gz
|
|
|
|
|
|
| |
Ignore-this: de708804321143bb34bea0920ec7e30b
darcs-hash:20090516122205-74baf-5c3998082833a6a36067c5a97e31a71d5f3a1a5d.gz
|