| 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.
|
| | |
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: f554aa2828a6779f0564dbbce8481e50
darcs-hash:20091202183051-39587-4c7aaf9e3046a921ae49dfb87c26263991a60260.gz
|
|
|
|
|
|
| |
Ignore-this: 8a3a5cbce1267cf0248069157ae5904b
darcs-hash:20091201183554-39587-1265d123015e0dbcc2e0efd8e1ca74dc989edd00.gz
|
|
|
|
|
|
| |
Ignore-this: 67206a4928b518e8bf57f97e5035ecf1
darcs-hash:20091115202117-f6493-85c9b6112d2336ae3a42a72b14ee638659914565.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: d40854cfc017fc8ac1a5da4437c32360
darcs-hash:20090801221608-dd5a0-b79c4cb9dae4c709210250356f72761edf0487b6.gz
|
|
|
|
|
|
| |
Ignore-this: 6cbc846f666c73086cc28327c2f661e4
darcs-hash:20090726192746-4b9dd-5b35e98747e193994abd00bb53f5c22ded272c0d.gz
|
|
|
|
| |
darcs-hash:20090525212742-f7d6d-e15e46892fb0e7877526a10a002546629e9e26a3.gz
|
|
|
|
|
|
| |
Ignore-this: f839ee8f30d4ebf9158d3b1934c22c94
darcs-hash:20090525172137-e545b-202faea4dff2aa62396c1ec3962d35c7c825ab03.gz
|
|
|
|
|
|
| |
Ignore-this: 45b0669966e5c62558f61073f38dc552
darcs-hash:20090417194727-bcacb-78768ff662da419afbead6908718ec3316aa2d6d.gz
|
|
|
|
|
|
| |
Ignore-this: fafc38e993f1ad0c7b7c5c747c783b10
darcs-hash:20090211181345-baf32-3e6bad3285031d50c50f255920dbaca0ed369d9f.gz
|
|
|
|
| |
darcs-hash:20090121173038-15659-bd88e89b637d26cfe078690dc61e8b91a0a77d9e.gz
|
|
|
|
| |
darcs-hash:20081201212346-23886-81f2bc6c2c021b3f1e9c7367d8ffbab12700e379.gz
|
|
|
|
| |
darcs-hash:20081022191907-c3d16-19588d7f40797baa600409bd39ece192ac0ef9e8.gz
|
|
|
|
| |
darcs-hash:20081011143946-23886-78628e3ca7ec0c40f5d288c6a9832cd52b8b083b.gz
|
|
|
|
| |
darcs-hash:20081008203414-1011c-85b7d515a43f405e8fbc3366b8195881a552d7a3.gz
|
|
|
|
| |
darcs-hash:20080915195208-19a6f-3e03e9f0547f62c1407e9f6adf64e5b061da8561.gz
|
|
|
|
| |
darcs-hash:20080815130000-f7d6d-2ecb0a83f96507db2cd51e60db292781f9c4da8e.gz
|
|
|
|
| |
darcs-hash:20080727074656-8cd3b-67ffbe95dc633d25fe36544389d59ae14d0da351.gz
|