summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge HEAD, branch 'master' of github.com:lupo49/dokuwikiMatthias Schulte2011-09-17
|
* ru: language updates (new strings of the Media Manager)Random2011-09-12
|
* en/fr: language updates (new strings of the Media Manager)FELTZ Vincent2011-09-12
|
* Merge branch 'master' of github.com:lupo49/dokuwikilupo492011-09-11
|\
| * 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
| | | |
| | * | 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
| | |\ \
| | * | | issue #9 permission for restoreKate Arzamastseva2011-08-24
| | | | |
| | * | | issue #57, function names, params, html fixesKate Arzamastseva2011-08-24
| | | | |
| | * | | Merge pull request #58 from michitux/media-revisionsKate Arzamastseva2011-08-21
| | |\ \ \ | | | | | | | | | | | | Fix permission and existence check for the recent changes
| | | * | | Fix the permission and file existence check in the recent changesMichael Hamann2011-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it was possible that changes for media files the user can't access were shown if the user could access a page with the same name. This also reverts the file existence check so it now really checks for media changes that the media file exists and for page changes the page and that not one of the two suffice for both.
| | * | | | issue #44 uploader fixes, #45 browser testingKate Arzamastseva2011-08-21
| | |/ / /
| | * | | issue #44 removing drop-area after uploadKate Arzamastseva2011-08-19
| | | | |
| | * | | issue #44 new uploader in the media popupKate Arzamastseva2011-08-19
| | | | |
| | * | | html fixKate Arzamastseva2011-08-19
| | | | |
| | * | | issue #56 ajax deleting imagesKate Arzamastseva2011-08-19
| | | | |
| | * | | issue #50 styling uploaderKate Arzamastseva2011-08-18
| | | | |
| | * | | issue #51 detail.php p tag fixedKate Arzamastseva2011-08-18
| | | | |
| | * | | issue #55 Search results are clickable nowKate Arzamastseva2011-08-15
| | | | |
| | * | | media revisions form less/more recent buttons fixKate Arzamastseva2011-08-15
| | | | |
| | * | | old fileuploader.css deletedKate Arzamastseva2011-08-15
| | | | |
| | * | | mediamanager html bug fixesKate Arzamastseva2011-08-15
| | | | |
| | * | | issue #50 styling the new uploaderKate Arzamastseva2011-08-15
| | | | |
| | * | | issue #51 link from detail view to fullscreen managerKate Arzamastseva2011-08-12
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 14:41:21 +0000