| Commit message (Collapse) | Author | Age |
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
inc/lang/hr/searchpage.txt
inc/lang/ko/searchpage.txt
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This now pulls all data from official jQuery sources. Either their CDN
or their github account. Google tends to serve outdated or even broken
files :-(
Unfortunately there's no simple way to get the latest stable jQuery-UI
so for now the version has to be adjusted manually in the script.
|
| | |
|
| |\
| | |
| | | |
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-245:
coding corrections. correct type hint, remove unused variable assignment
HTTPClient don't pull too much bytes when no content-length is given
de/de-informal: localization updates (delete user function)
unit tests for self deleting of user accounts
FS#2751 - self deletion of user account
Conflicts:
inc/lang/de-informal/lang.php
inc/lang/de/lang.php
|
| | |
|
|/
|
|
| |
/ fix several typos / Fixes FS#2821
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* subscription: (25 commits)
link directly to subscription management in mails
only use mailfromnobody for bulk mails
added missing context for list mails
readded mailfromnobody to subscription sending
correctly escape diffs in HTML mails
fixed lists in HTML mails
simplified subscription->add() code a bit
comment adjusted
removed unused vars
removed data parameter in subscription_handle_post()
fixed tests
some reformatting
added compatibility function
moved registration notification to subscription class
fixed merge error in inc/auth.php
consolidate more notification code in subscription class
minor cleanup
initialize new subscriptions with current time
fixed subscription management
correctly check if subscriptions are enabled
...
|
| |
| |
| |
| |
| | |
This was updated in the english translation a while ago, but was still
missing in some translations
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
|
| |
|
|
|
|
| |
de / typo fix
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
inc/lang/de-informal/lang.php
|
| | |
|