summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:lupo49/dokuwikilupo492011-09-11
|\
| * de/de-informal/en language file updatesMatthias Schulte2011-09-11
| * Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki int...Anika Henke2011-09-10
| |\
| | * 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
| | * Whitespace and brackets cleanupHakan Sandell2011-09-10
| | * Usage of 'disabled' file to control plugins deprecatedHakan Sandell2011-09-10
| | * Code cleanup documentation before mergeHakan Sandell2011-09-10
| | * added new plugins config cascade and added plugin.info.txtPiyush Mishra2011-08-20
| * | media manager design: added icon to resizing handle and changed background co...Anika Henke2011-09-10
| * | 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
| |\ \
| | * | issue #61 security fixKate Arzamastseva2011-09-06
| | * | issue #59 security fixKate Arzamastseva2011-09-06
| | * | Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revi...Kate Arzamastseva2011-09-05
| | |\ \ | | |/ / | |/| |
| * | | Add testcases for search_indexAdrian Lang2011-09-04
| * | | Revert tmp commitsAdrian Lang2011-09-04
| * | | 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 functi...Kate Arzamastseva2011-09-02
| | * | 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 the permission and file existence check in the recent changesMichael Hamann2011-08-21
| | * | | | 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
| | * | | issue #50 partly styling the new uploaderKate Arzamastseva2011-08-12
| | * | | issue #44, #52 media_upload reused, error handlingKate Arzamastseva2011-08-12
| | * | | issue #44 uploader css fixKate Arzamastseva2011-08-08