summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* Merge pull request #531 from dokuwiki-translate/lang_update_10Andreas Gohr2014-02-04
|\ | | | | Translation update (sl)
| * translation updatematej2014-02-04
| |
* | Merge pull request #503 from splitbrain/datepickerlocaleAndreas Gohr2014-02-02
|\ \ | | | | | | localize jQuery UI date picker FS#2912
| * | do not keep zero size filesAndreas Gohr2014-01-17
| | |
| * | localize jQuery UI date picker FS#2912Andreas Gohr2014-01-17
| | |
* | | Merge pull request #265 from splitbrain/video-audioAnika Henke2014-02-02
|\ \ \ | | | | | | | | Added video and audio support
| * \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2014-02-02
| |\ \ \
| * | | | fixed html errors in video and audio renderingAnika Henke2014-02-02
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2014-01-26
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-11-02
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-08-04
| |\ \ \ \ \ \
| * | | | | | | refactored audio/video code, removed wrong link around audioAnika Henke2013-08-04
| | | | | | | |
| * | | | | | | fixed typoAnika Henke2013-08-04
| | | | | | | |
| * | | | | | | added support for html5 audioAnika Henke2013-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to videos, all .ogg, .mp3 and .wav files with the same filename are automatically chosen as alternative sources when only one of them is mentioned in the media syntax.
| * | | | | | | improved code for videos (restrict to 3 mimetypes, removed codec info from ↵Anika Henke2013-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type attribute)
| * | | | | | | added poster attribute to video if jpg or png with same file name existsAnika Henke2013-08-02
| | | | | | | |
| * | | | | | | Add several alternative formats to video for better browser compatibilityAnika Henke2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All .webm, .ogv and .mp4 files with the same filename are automatically chosen as alternative sources when only one of them is mentioned in the media syntax.
| * | | | | | | added basic suport for embedding (html5) videosAnika Henke2013-08-02
| | | | | | | |
* | | | | | | | Merge pull request #508 from splitbrain/lessphp52Andreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | FS#2901: Fix lessphp on PHP 5.2.0
| * | | | | | | | FS#2901: Fix lessphp for PHP 5.2.0Michael Hamann2014-01-19
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #517 from gamma/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add the original filename to sendFile for Content-Disposition
| * | | | | | | | Re-order parameters to not break other callersGerry Weißbach2014-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needs a check for null now.
| * | | | | | | | nopGerry Weißbach2014-01-27
| | | | | | | | |
| * | | | | | | | Use original filename for Content-DispositionGerry Weißbach2014-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases this change will have no effect, but noes the response will use the filename that was originally requested. The downloaded filename can be modified to something different as well. E.g. the siteexport plugin will make use of it.
* | | | | | | | | Merge remote-tracking branch 'origin/PR523'Andreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/PR523: Update tpl_getConf() signature to match plugin::getConf()
| * | | | | | | | | Update tpl_getConf() signature to match plugin::getConf()Christopher Smith2014-02-02
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #512 from araname/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Translation update (ko)
| * | | | | | | | translation updateMyeongjin2014-01-24
| | | | | | | | |
* | | | | | | | | Merge pull request #525 from dokuwiki-translate/lang_update_57Andreas Gohr2014-01-31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Translation update (id)
| * | | | | | | | | translation updateumriya afini2014-01-31
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #521 from dokuwiki-translate/lang_update_47Andreas Gohr2014-01-29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Translation update (cs)
| * | | | | | | | | translation updatePetr Klíma2014-01-29
| |/ / / / / / / /
* | | | | | | | | Merge pull request #518 from dokuwiki-translate/lang_update_41Andreas Gohr2014-01-27
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Translation update (tr)
| * | | | | | | | translation updatehuseyin can2014-01-27
| |/ / / / / / /
* | | | | | | | Merge pull request #514 from dokuwiki-translate/lang_update_39Andreas Gohr2014-01-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Translation update (sk)
| * | | | | | | | translation updateMartin Michalek2014-01-25
| |/ / / / / / /
* | | | | | | | Merge pull request #511 from dokuwiki-translate/lang_update_33Andreas Gohr2014-01-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Translation update (pl)
| * | | | | | | | translation updatePaweł Jan Czochański2014-01-22
| |/ / / / / / /
* | | | | | | | rename render() to render_text() in Doku_Plugin. #496Andreas Gohr2014-01-22
| | | | | | | |
* | | | | | | | add missing autoloader entry for Doku_Parser_Mode_Plugin #496Andreas Gohr2014-01-22
| | | | | | | |
* | | | | | | | Merge pull request #510 from dokuwiki-translate/lang_update_30Andreas Gohr2014-01-22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Translation update (el)
| * | | | | | | | translation updatecross2014-01-22
| |/ / / / / / /
* / / / / / / / translation updatePaweł Jan Czochański2014-01-21
|/ / / / / / /
* | | | | | | Merge pull request #496 from splitbrain/plugindedupAndreas Gohr2014-01-19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove some code duplication from syntax plugins
| * | | | | | | reintroduce a tiny bit of duplicationAndreas Gohr2014-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reads some duplication in the from of haveing a Doku_Parser_Mode and Doku_Parser_Mode_Plugin class which are basically the same but only the latter extends DokuWiki_Plugin. This avoids the performance/RAM problems mentioned in my previous commit. An interface keeps both logically together. With PHP 5.4 further deduplication could be done via Traits.
| * | | | | | | remove duplicate plugin code for syntax pluginsAndreas Gohr2014-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Doku_Parser_Mode inherit from DokuWiki_Plugin which allows for the removal of a bunch of duplicate code form DokuWiki_Syntax_Plugin. This makes the code easier to maintain and makes sure all DokuWiki plugins are actual instances of DokuWiki_Plugin. However this adds a bunch of functions to the "normal" parser modes that don't need them which could have performance/RAM implications.
* | | | | | | | Merge pull request #493 from splitbrain/acleventAndreas Gohr2014-01-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | AUTH_ACL_CHECK event around ACL checking
| * | | | | | | | AUTH_ACL_CHECK event around ACL checkingAndreas Gohr2014-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allows to modify ACL results in the AFTER event or to implement a completely different ACL mechanism in the BEFORE event.
* | | | | | | | | Merge pull request #454 from lisps/resize_image-heightAndreas Gohr2014-01-19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Resize image by height
| * | | | | | | | | fix indentlisps2013-11-27
| | | | | | | | | |