Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'resetpassword' | Andreas Gohr | 2012-03-10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
| * | honor autopasswd setting for resend password | Andreas Gohr | 2011-10-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
* | | added 5 new language strings for action tools and skip link (needs translations) | Anika Henke | 2012-01-29 |
| | | | | | | | | This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them. | ||
* | | corrected old mediaupload introduction text | Anika Henke | 2012-01-19 |
| | | |||
* | | localization: removed strings from old flashuploader | lupo49 | 2012-01-13 |
|/ | |||
* | removed remnants of old flash uploader (FS#2335) | Anika Henke | 2011-10-15 |
| | |||
* | Add file revision above file detail page | Adrian Lang | 2011-09-19 |
| | |||
* | media manager: renamed List display option to 'Rows' | Anika Henke | 2011-09-19 |
| | |||
* | media manager: shortened text for media list headline | Anika Henke | 2011-09-19 |
| | |||
* | media manager: improved spacing around option buttons and changed lang ↵ | Anika Henke | 2011-09-19 |
| | | | | strings for them | ||
* | media manager: moved some html out of lang.php and fixed namespace in middle ↵ | Anika Henke | 2011-09-19 |
| | | | | panel | ||
* | media manager: word changes | Anika Henke | 2011-09-18 |
| | |||
* | Rework media manager HTML (JS and CSS will come) | Adrian Lang | 2011-09-17 |
| | |||
* | improved words for different diff views of images | Anika Henke | 2011-09-16 |
| | |||
* | en/fr: language updates (new strings of the Media Manager) | FELTZ Vincent | 2011-09-12 |
| | |||
* | de/de-informal/en language file updates | Matthias Schulte | 2011-09-11 |
| | | | | | | | | 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. | ||
* | Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki ↵ | Anika Henke | 2011-09-10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
| * | Code cleanup documentation before merge | Hakan Sandell | 2011-09-10 |
| | | | | | | | | Function get_plugin_components() moved to extantion manager | ||
| * | added new plugins config cascade and added plugin.info.txt | Piyush Mishra | 2011-08-20 |
| | | |||
* | | merging | Kate Arzamastseva | 2011-08-25 |
|\| | |||
| * | jqueryized locktimer | Andreas Gohr | 2011-08-19 |
| | | |||
* | | issue #44 new uploader in the media popup | Kate Arzamastseva | 2011-08-19 |
| | | |||
* | | issue #50 styling uploader | Kate Arzamastseva | 2011-08-18 |
| | | |||
* | | mediamanager html bug fixes | Kate Arzamastseva | 2011-08-15 |
| | | |||
* | | issue #50 styling the new uploader | Kate Arzamastseva | 2011-08-15 |
| | | |||
* | | issue #51 link from detail view to fullscreen manager | Kate Arzamastseva | 2011-08-12 |
| | | |||
* | | issue #50 partly styling the new uploader | Kate Arzamastseva | 2011-08-12 |
| | | |||
* | | image diffs fixes | Kate Arzamastseva | 2011-07-26 |
| | | |||
* | | mediamanager sort button | Kate Arzamastseva | 2011-07-25 |
| | | |||
* | | Recent Changes integration of media changes | Kate Arzamastseva | 2011-07-25 |
| | | |||
* | | notification mails | Kate Arzamastseva | 2011-07-18 |
| | | |||
* | | mediamanager tabs, upload form fix | Kate Arzamastseva | 2011-07-14 |
| | | |||
* | | mediamanager fix | Kate Arzamastseva | 2011-07-08 |
| | | |||
* | | restoring old media revisions | Kate Arzamastseva | 2011-06-30 |
| | | |||
* | | media action buttons | Kate Arzamastseva | 2011-06-24 |
| | | |||
* | | media manager auth fix | Kate Arzamastseva | 2011-06-23 |
| | | |||
* | | media version saving metadata | Kate Arzamastseva | 2011-06-22 |
| | | |||
* | | media history | Kate Arzamastseva | 2011-06-20 |
| | | |||
* | | media manager button | Kate Arzamastseva | 2011-06-20 |
| | | |||
* | | media manager | Kate Arzamastseva | 2011-06-13 |
|/ | |||
* | added 'register' and 'resendpwd' to action links and buttons | Anika Henke | 2011-02-20 |
| | | | | | Attention: $lang['register'] has been renamed to $lang['btn_register'], anyone using that in any plugin or template should adjust it. | ||
* | Make diff type selectable | Andreas Gohr | 2011-01-31 |
| | |||
* | Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3 | Michael Hamann | 2010-11-29 |
| | | | | | | As of VIM 7.3 it is no longer possible to specify the encoding in the modeline. This gives an error message whenever such a file is opened, thus this commit removes the enc setting from the modeline. | ||
* | renamed index to sitemap FS#2026 | Andreas Gohr | 2010-10-02 |
| | |||
* | improved diff permalink | Anika Henke | 2010-07-02 |
| | |||
* | FS#1821: Added a permalink to the diff output | Gina Haeussge | 2010-06-27 |
| | |||
* | FS#1795: Restrict media manager to users with at least read access | Gina Haeussge | 2010-06-27 |
| | | | | on the supplied namespace. | ||
* | FS#433: Editor now uses onbeforeunload event to capture ANY leaving of it | Gina Haeussge | 2010-06-27 |
| | | | | | | | | besides via Save or Preview button. This has been successfully tested in FF, Chrome and IE6/7/8. Opera does not support onbeforeunload, therefore the draft is kept if the user navigates away from the editor. Please test this. | ||
* | Added license chooser to installer FS#1926 | Andreas Gohr | 2010-06-26 |
| | | | | | | | | | This adds a license chooser to the installer. The installer defaults to the more free CC-BY-SA. CC-NC-BY-SA is still the default in dokuwiki.php to keep backwards compatibility. The license array was reordered and Non-Derivative licenses removed (they don't make much sense for wiki content). | ||
* | Show subscription time on management page | Adrian Lang | 2010-05-04 |
| |