summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* de/de-informal/en language file updatesMatthias Schulte2011-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 Henke2011-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
| * empty conf/plugins.local is created if not existingHakan Sandell2011-09-10
| |
| * Added comment in conf/plugins.local about how disabled files workHakan Sandell2011-09-10
| |
| * Removed tmp_bak array, no need for checking before save if anything changedHakan Sandell2011-09-10
| |
| * Now using io_savefile with locking and added headerHakan Sandell2011-09-10
| | | | | | | | when saving plugin.local
| * Whitespace and brackets cleanupHakan Sandell2011-09-10
| |
| * Usage of 'disabled' file to control plugins deprecatedHakan Sandell2011-09-10
| | | | | | | | | | Plugins with a disabled file will be treated as having an entry (=0) in conf/plugins.default.php overridable by conf/plugins.local.php
| * Code cleanup documentation before mergeHakan Sandell2011-09-10
| | | | | | | | Function get_plugin_components() moved to extantion manager
| * added new plugins config cascade and added plugin.info.txtPiyush Mishra2011-08-20
| |
* | media manager design: added icon to resizing handle and changed background ↵Anika Henke2011-09-10
| | | | | | | | colour
* | media manager design: more spacing and some colour changesAnika Henke2011-09-10
| |
* | media manager design: improved some spacingAnika Henke2011-09-10
| |
* | media manager design: added headlineAnika Henke2011-09-10
| |
* | Merge branch 'media-revisions'Michael Hamann2011-09-08
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new media manager and media revisions to DokuWiki. The changes have been implemented by Kate Arzamastseva and are 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/kate/18001 Thanks to Kate for the work and Google for sponsoring it!
| * | issue #61 security fixKate Arzamastseva2011-09-06
| | |
| * | issue #59 security fixKate Arzamastseva2011-09-06
| | |
| * | Merge branch 'master' of git://github.com/splitbrain/dokuwiki into ↵Kate Arzamastseva2011-09-05
| |\ \ | |/ / |/| | | | | media-revisions
* | | Add testcases for search_indexAdrian Lang2011-09-04
| | |
* | | Revert tmp commitsAdrian Lang2011-09-04
| | | | | | | | | | | | | | | This reverts commit ba6c070edd92ca0fc8a6ee85d51769d64a19ee7c. This reverts commit 923510088dda99cb2790b15308593e47369d4f01.
* | | tmpAdrian Lang2011-09-04
| | |
* | | tmp: Introduce sneaky2Adrian Lang2011-09-04
| | |
* | | Use search_universal in search_indexAdrian Lang2011-09-04
| | |
* | | Polish language updateŁukasz Chmaj2011-08-27
| | |
* | | Spanish language updateOscar Ciudad2011-08-27
| | |
| * | mediamanager window resize fixKate Arzamastseva2011-09-02
| | |
| * | issue #46 Render links to missing media files as link to the media managerKate Arzamastseva2011-09-02
| | |
| * | issue #47 Changes to old media manager popup: removing edit and delete ↵Kate Arzamastseva2011-09-02
| | | | | | | | | | | | functionality
| * | issue #54 sorting on searchKate Arzamastseva2011-09-02
| | |
| * | issue #54 listview switch/sorting on searchKate Arzamastseva2011-08-27
| | |
| * | mergingKate Arzamastseva2011-08-25
| |\ \ | |/ / |/| |
* | | Update jquery-cookie, cleanup dw_cookieAdrian Lang2011-08-22
| | | | | | | | | | | | Pulled the current jquery-cookie version from https://github.com/carhartl/jquery-cookie.
* | | Add missing callback param to dw_toggleAdrian Lang2011-08-22
| | |
* | | Deprecate several helper functions, JSLINT helpers.jsAdrian Lang2011-08-22
| | |
* | | page.js: Improve footnote cleaning regex, cleaner toc togglingAdrian Lang2011-08-22
| | | | | | | | | | | | | | | * <sup> elements are only removed from the start of a footnote * the TOC wrapper instantly gets the target size to reduce layout jumping
* | | JSLINT locktimer, fix date passing in draftsaveAdrian Lang2011-08-22
| | | | | | | | | | | | | | | Since 80997d21e0aee9b8f27153000742ecd781f429f8 the date passed to the draft save backend is indeed the page id, not the date.
* | | avoid 100% cpu usage when reading HTTP headers FS#2304Andreas Gohr2011-08-21
| | |
* | | fixed TOC-Bug and moved TOC behaviour to page.js FS#2314Andreas Gohr2011-08-21
| |/ |/|
* | moved keyhandler to the new dw_editor objectAndreas Gohr2011-08-19
| |
* | renamed some variables in editor.jsAndreas Gohr2011-08-19
| |
* | deprecated delay.jsAndreas Gohr2011-08-19
| |
* | jQuerify acl plugin JavaScriptAdrian Lang2011-08-19
| |
* | Don't delete meta files when pages are deleted, fixes FS#2301Michael Hamann2011-08-19
| | | | | | | | | | | | | | | | As we need to keep all core meta files anyway (the only core file that had been deleted but shouldn't be deleted is the .indexed file) and plugins can keep care of their own metadata files using the IO_WIKIPAGE_WRITE event there is no reason for using the expensive metaFiles() function during the deletion of pages.
* | Fix tree HTML (closes FS#2299)Adrian Lang2011-08-19
| |
* | moved more stuff out from script.jsAndreas Gohr2011-08-19
| | | | | | | | the file is nearly empty now
* | jqueryized diff checkbox scriptAndreas Gohr2011-08-19
| |
* | jQuerify edit section highlightingAdrian Lang2011-08-19
| |
* | Fix popup DOM element sharing, simplify event handlingAdrian Lang2011-08-19
| |
* | jqueryized locktimerAndreas Gohr2011-08-19
| |
* | added missing fileAndreas Gohr2011-08-19
| | | | | | | | yeah, yeah I know...