summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAge
* Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524Andreas Gohr2014-02-14
|\ | | | | | | | | | | * 'master' of git://github.com/SteScho/dokuwiki: Update auth.php Update auth.php
| * Update auth.phpSteScho2014-02-03
| | | | | | As suggested by @selfthinker
| * Update auth.phpSteScho2014-01-30
| | | | | | In Novell eDir the group search returns strings, not arrays. Added if-statement which determines if the result is an array or an string.
* | adjusted IE detection for smblinksAndreas Gohr2014-02-13
| | | | | | | | | | | | | | | | MSIE 11 tries hard to break any previous working browser detection even through feature checks. This resolves to browser sniffing (MSIE for old IE, Trident for IE11+) See https://forum.dokuwiki.org/thread/10824
* | 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
| |\ \ \ \ \ \ \
| * | | | | | | | added spacing below video and audio elementsAnika Henke2013-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: The spacing will now show as too much as long as the paragraph bug is not fixed
| * | | | | | | | added basic suport for embedding (html5) videosAnika Henke2013-08-02
| | | | | | | | |
* | | | | | | | | Merge pull request #505 from splitbrain/fs2915Andreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | renamed conflicting JavaScript functions FS#2915
| * | | | | | | | | renamed conflicting JavaScript functions FS#2915Andreas Gohr2014-01-17
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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
| | | | | | | | | |
| * | | | | | | | | 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 pull request #512 from araname/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Translation update (ko)
| * | | | | | | | | | translation updateMyeongjin2014-01-24
| | | | | | | | | | |
* | | | | | | | | | | fix error on CSS includes on windowsAndreas Gohr2014-02-02
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex wasn't properly escaped here which lead to problems when the path contains backslashes. This is the root cause of the bug reported at https://github.com/cosmocode/edittable/issues/19
* | | | | | | | | | Merge pull request #525 from dokuwiki-translate/lang_update_57Andreas Gohr2014-01-31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Translation update (id)
| * | | | | | | | | | translation updateumriya afini2014-01-31
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | extension manager: some minor tweaks in the info screenAndreas Gohr2014-01-30
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #521 from dokuwiki-translate/lang_update_47Andreas Gohr2014-01-29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Translation update (cs)
| * | | | | | | | | translation updatePetr Klíma2014-01-29
| |/ / / / / / / /
* | | | | | | | | Update action.phpjgpcx2014-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug that only allows admins any AJAX calls
* | | | | | | | | Merge pull request #518 from dokuwiki-translate/lang_update_41Andreas Gohr2014-01-27
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Translation update (tr)
| * | | | | | | | translation updatehuseyin can2014-01-27
| |/ / / / / / /
* | | | | | | | Merge pull request #515 from dokuwiki-translate/lang_update_40Andreas Gohr2014-01-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Translation update (fr)
| * | | | | | | | translation updateMomo502014-01-25
| |/ / / / / / /
* | | | | | | | Merge pull request #514 from dokuwiki-translate/lang_update_39Andreas Gohr2014-01-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Translation update (sk)
| * | | | | | | | translation updateMartin Michalek2014-01-25
| |/ / / / / / /
* | | | | | | | removed empty language filesAndreas Gohr2014-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our translation interface used to submit empty files for a while but no longer does, so these can go
* | | | | | | | 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 #499 from splitbrain/mobile_previewAndreas Gohr2014-01-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | dokuwiki template: Fix the preview width on small screens FS#2914
| * | | | | | | | dokuwiki template: Fix the preview width on small screens FS#2914Michael Hamann2014-01-12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #454 from lisps/resize_image-heightAndreas Gohr2014-01-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Resize image by height
| * | | | | | | | media image can be resized by height (without width)lisps2013-11-27
| | | | | | | | |
* | | | | | | | | Merge branch 'extension_manager'Andreas Gohr2014-01-19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * extension_manager: (71 commits) added plugins group to test show a message when search returns no results added missing localization better filename parsing use DOKU_LF remove unneeded try/catch blocks typo fix purge cache only once on install check for admin in AJAX backend now use new core funtion to recursively delete added status to info list of extension plugin added css and html changes for RTL scripts to extension manager added basic mobile styles to extension manager (not great, but makes things at least readable) fixed and improved some HTML in extension manager added git warning fixed strict standard error and added some docblock removed the old plugin manager typo fix protect authplain and current auth plugin do not show updates for bundled plugins ... Conflicts: lib/plugins/plugin/lang/hu/admin_plugin.txt lib/plugins/plugin/lang/hu/lang.php
| * | | | | | | | added plugins group to testAndreas Gohr2014-01-14
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 16:06:21 +0000