| Commit message (Collapse) | Author | Age |
| |
|
|\
| |
| | |
refactor detail.php to template.php
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 524df5769a0b9b7aa35af6500c85528c2b0515fe.
Conflicts:
inc/lang/bn/lang.php
inc/lang/fr/lang.php
|
| |
| |
| |
| | |
this has been done by a script and might not be 100% accurate
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: 72f2be7c1e902a4f649c7aba39ec02d9
darcs-hash:20091215213955-bd3aa-c9faaab3c7fafbc7943149f33d6a518078b804ed.gz
|
|
|
|
|
|
| |
Ignore-this: 27ea52110bce929b2c61ed8faba67cfc
darcs-hash:20091016205526-c0bf4-35eba4e65d37980a667ba982f7f1ea5b7b07f01c.gz
|
|
|
|
|
|
|
|
| |
Ignore-this: 7c8f68f29f52bc1d33fdb76ba98d2307
Removed unused string, move another string to the [js] subarray.
darcs-hash:20090812191138-6e07b-65db1b7560d437fb26a1a4d0095cd768b2c9af01.gz
|
|
|
|
|
|
| |
Ignore-this: de3bd855c542ea27ecd54eee64e5c873
darcs-hash:20090809195453-04fb5-b2d6367ec03bf477f2b100052f44ebf9c9cc1be0.gz
|
|
|
|
|
|
| |
Ignore-this: 80b625b4a39988591a318752948be55e
darcs-hash:20090214161905-bd3aa-df7a3e483b1593df486c31304b5041eba5cf4ce5.gz
|
|
|
|
|
|
| |
Ignore-this: cbebb552ec9587d178ffcb9f253b7334
darcs-hash:20090213231339-bd3aa-f26c1df1eb8121f6e1a81d35c9687d9de4e911ac.gz
|
|
|
|
|
|
| |
Ignore-this: dbce0102859f70eb7bf5b9b303aa41cb
darcs-hash:20090213183147-bd3aa-c52cf1eef1a19b53637d7910250265f01fba56d3.gz
|
|
|
|
|
|
| |
Ignore-this: 8ca435cd1a86ac53914f7f5b5f17ab6d
darcs-hash:20090213151803-bd3aa-a7102bd0c603b9ea51e4d805d707c77943ab3950.gz
|
|
|
|
|
|
| |
Ignore-this: c8b219dbe61a16304636ca2b633ccc3c
darcs-hash:20090213100410-bd3aa-bdc7dc22c1c24c4632d0b1abe84d983e9a0dfd1d.gz
|
|
|
|
|
|
| |
Ignore-this: e01610446dac451f1ba4ff19a9feb889
darcs-hash:20090213073955-bd3aa-1cb54fe797e6d0fa62c0b729b48f51d0d8088499.gz
|
|
|
|
|
|
| |
Ignore-this: c083994b478d4d5c06cd8ae6e9d5c5bb
darcs-hash:20090212220538-bd3aa-f6e68c7de4f9ae4ee54ba744b8ff5f875ed3c2aa.gz
|
|
|
|
| |
darcs-hash:20081127154301-2faaa-aab154895ba76049c4ba8ae86d34471694dc5311.gz
|
|
darcs-hash:20081003123628-5222e-a76b636053ff5d843937e3e2ce9ff5cc48e6c09f.gz
|