Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | coding style updates | Andreas Gohr | 2012-03-16 |
| | |||
* | 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 | ||
| * | removed commented line | Andreas Gohr | 2012-02-17 |
| | | |||
| * | 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 div.table around non-editable content as well (FS#1980) | Anika Henke | 2012-02-04 |
|/ | |||
* | HTML compliant fix for missing ul wrapper in TOC (FS#2328) | Hakan Sandell | 2011-10-17 |
| | |||
* | Fixed missing ul wrapper in TOC (FS#2328) | Hakan Sandell | 2011-10-15 |
| | |||
* | media manager: added a few newlines to the output | Anika Henke | 2011-09-19 |
| | |||
* | media manager: small functionality and css changes | Anika Henke | 2011-09-19 |
| | |||
* | Rework media manager HTML (JS and CSS will come) | Adrian Lang | 2011-09-17 |
| | |||
* | merging | Kate Arzamastseva | 2011-08-25 |
|\ | |||
| * | Fix tree HTML (closes FS#2299) | Adrian Lang | 2011-08-19 |
| | | |||
| * | fixed empty target in license link | Anika Henke | 2011-08-01 |
| | | |||
* | | issue #57, function names, params, html fixes | Kate Arzamastseva | 2011-08-24 |
| | | |||
* | | html fix | Kate Arzamastseva | 2011-08-19 |
| | | |||
* | | media revisions form less/more recent buttons fix | Kate Arzamastseva | 2011-08-15 |
| | | |||
* | | issue #38 diff links only if diff available; deleted files | Kate Arzamastseva | 2011-08-03 |
| | | |||
* | | issue #9 config option to disable media revisions, auth | Kate Arzamastseva | 2011-08-02 |
| | | |||
* | | css class name fix | Kate Arzamastseva | 2011-08-01 |
| | | |||
* | | issue #38 links and icons in recent changes | Kate Arzamastseva | 2011-07-30 |
| | | |||
* | | Recent Changes integration of media changes | Kate Arzamastseva | 2011-07-25 |
| | | |||
* | | mediamanager revisions form | Kate Arzamastseva | 2011-07-19 |
| | | |||
* | | Merge branch 'master' of git://github.com/splitbrain/dokuwiki into ↵ | Kate Arzamastseva | 2011-07-15 |
|\| | | | | | | | media-revisions | ||
| * | Fix some bugs and glitches in (mediamanager) tree | Adrian Lang | 2011-07-11 |
| | | | | | | | | | | | | * Fix selector in subtree loading callback * Remove HTML inconsistencies between AJAX and plain PHP lists * Unify icon and CSS class switching in dw_tree and dw_mediamanager | ||
* | | media-manager fixes | Kate Arzamastseva | 2011-07-09 |
| | | |||
* | | mediamanager fix | Kate Arzamastseva | 2011-07-08 |
| | | |||
* | | mediamanager ajax forms | Kate Arzamastseva | 2011-07-04 |
| | | |||
* | | media history | Kate Arzamastseva | 2011-06-20 |
| | | |||
* | | media history | Kate Arzamastseva | 2011-06-14 |
| | | |||
* | | media manager | Kate Arzamastseva | 2011-06-13 |
| | | |||
* | | recent changes fix | Kate Arzamastseva | 2011-06-10 |
| | | |||
* | | type of recent changes selection fix | Kate Arzamastseva | 2011-06-05 |
| | | |||
* | | type of recent changes selection | Kate Arzamastseva | 2011-06-05 |
|/ | |||
* | tiny fixes for xhtml strict | Anika Henke | 2011-04-17 |
| | |||
* | removed empty id in register form (FS#2222) | Anika Henke | 2011-04-17 |
| | |||
* | don't use form_makeTag() for blank.gif as empty attributes are not passed on ↵ | Anika Henke | 2011-04-16 |
| | | | | (which resulted in a missing alt attribute) | ||
* | removed nbsps from some clearer divs | Anika Henke | 2011-04-16 |
| | |||
* | fixed invalid html in diff options | Anika Henke | 2011-04-16 |
| | |||
* | avoid broken page on bad non-UTF8 highlight string | Andreas Gohr | 2011-03-05 |
| | |||
* | 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. | ||
* | hide security check image if everything is alright | Andreas Gohr | 2011-02-06 |
| | |||
* | improved data security check on admin | Anika Henke | 2011-02-06 |
| | |||
* | fixed inline diff selector loosing page context | Andreas Gohr | 2011-02-05 |
| | |||
* | Make diff type selectable | Andreas Gohr | 2011-01-31 |
| | |||
* | allow placeholders in search intro text | Andreas Gohr | 2011-01-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | This patch allows to use the placeholders in the search intro message that will be replaced with the search term. @SEARCH@ will be replaced with the search query @QUERY@ will be replaced with the URL encoded search query for use in URL parameters Please note that the replacement is don't on the XHTML *after* parsing and rendering the intro wiki text. This means you can not use the query where an ID would be expected. Examples: This will work: [[http://www.google.com/search?q=@QUERY@|Google for @SEARCH@]]. This will not work and will link to the page "search" instead: [[@SEARCH@|Your page]]. You could use this instead: [[this>doku.php?id=@QUERY@|Your page]]. | ||
* | Revert "tmp" for inc/html.php as it breaks the diff output | Michael Hamann | 2011-01-18 |
| | | | | This reverts commit fa7c70ff4d7f9999466436e7d559eb0c81571779. | ||
* | Merge branch 'master' of github.com:splitbrain/dokuwiki | Adrian Lang | 2011-01-14 |
|\ | |||
| * | Fix msg() calls when messages have already been printed | Michael Hamann | 2011-01-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two bugs that occurred when msg() was called after html_msgarea() had already been called. - the $MSG array is now cleared when it has been printed (otherwise $MSG has been printed again when another msg() call was done) - headers_sent() didn't work for me, it always reported false although html_msgarea() had already been called which might be explainable with output buffering. This makes msg() now depend on the first call of html_msgarea() or headers_sent() in order to not to break msg() in ajax requests etc. | ||
| * | added space between license text and link | Anika Henke | 2011-01-02 |
| | | |||
* | | tmp | Adrian Lang | 2010-12-08 |
| | |