| Commit message (Collapse) | Author | Age |
|---|
| ... | |
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| | |
(FS#2543)
|
| |/ |
|
| | |
|
| |
|
|
|
|
| |
summary field.
This allows easier identifying of which version has been restored. (FS#2522)
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...
Conflicts:
inc/auth.php
inc/load.php
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* adexpirywarn:
make sure AD pass expiry message is never shown twice
do not hardcode profile link in AD pass expire message
translatable AD expiry warning and link to update profile page
Don't return any data for non-existant users
do not query AD for empty user name
always check expire time when configured
Check password expiry times in Active Directory backend
|
| | | |
| | |
| | |
| | | |
Changing passwords might not be available.
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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 is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them.
|
| | | | |
|
| | |/ |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Using the place holder @MEDIA(<mediaid>)@ you now can directly embed
images from the media repository into your HTML mail template.
An example was added to the mailwrap.html, but because images are
embedded as is (no prescaling) this is suboptimal. If we keep it, a
smaller version of the DokuWiki logo should be shipped with DokuWiki.
|
| |/
|
|
|
|
|
|
|
|
| |
The mailwrap.html adds the standard headers and footers to all HTML
mails. The signature present in the text body will be removed before
inserting in the wrapper, allowing a nicer footer for HTML.
Users can overwrite the file with their own to create HTML mails in
corporate design. However, a way to automatically embed referenced
images is missing currently.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
strings for them
|
| |
|
|
| |
panel
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
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.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into plugincontroller
This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001
Thanks to Piyush for the work and Google for sponsoring it!
Conflicts:
inc/lang/en/lang.php
|
| | |
| |
| |
| | |
Function get_plugin_components() moved to extantion manager
|
| | | |
|
| |\| |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
