Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524 | Andreas Gohr | 2014-02-14 |
|\ | | | | | | | | | | | * 'master' of git://github.com/SteScho/dokuwiki: Update auth.php Update auth.php | ||
| * | Update auth.php | SteScho | 2014-02-03 |
| | | | | | | As suggested by @selfthinker | ||
| * | Update auth.php | SteScho | 2014-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 smblinks | Andreas Gohr | 2014-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 | ||
* | | make HTTPclient check for SSL support | Andreas Gohr | 2014-02-13 |
| | | |||
* | | Merge pull request #534 from dokuwiki-translate/lang_update_17 | Anika Henke | 2014-02-12 |
|\ \ | | | | | | | Translation update (fr) | ||
| * | | translation update | kloppel | 2014-02-07 |
| | | | |||
* | | | HTTPClient: correctly abort a proxy connection | Andreas Gohr | 2014-02-11 |
| | | | | | | | | | | | | if a needed CONNECT tunnel fails | ||
* | | | order seems to matter for phpunit parameters | Andreas Gohr | 2014-02-11 |
| | | | |||
* | | | Merge pull request #537 from dokuwiki-translate/lang_update_19 | Andreas Gohr | 2014-02-11 |
|\ \ \ | | | | | | | | | Translation update (hu-formal) | ||
| * | | | translation update | Marina Vladi | 2014-02-08 |
| |/ / | |||
* | | | Merge pull request #539 from dokuwiki-translate/lang_update_32 | Andreas Gohr | 2014-02-09 |
|\ \ \ | | | | | | | | | Translation update (bn) | ||
| * | | | translation update | ninetailz | 2014-02-09 |
| |/ / | |||
* | | | show verbose info on skipped tests at travis | Andreas Gohr | 2014-02-09 |
| | | | |||
* | | | more robust HTTP testing | Andreas Gohr | 2014-02-09 |
| | | | | | | | | | | | | | | | | | | connections are now retried after timeout and failing connections will be marked as skipped instead of failing. This should reduce false alarms on travis | ||
* | | | always show error on HTTP test fails | Andreas Gohr | 2014-02-09 |
| | | | |||
* | | | renamed code button to monospace FS#2934 and many others | Andreas Gohr | 2014-02-05 |
| | | | | | | | | | | | | Let's stop confusing people with what this button does | ||
* | | | Merge pull request #530 from dokuwiki-translate/lang_update_9 | Andreas Gohr | 2014-02-04 |
|\ \ \ | | | | | | | | | Translation update (sl) | ||
| * | | | translation update | matej | 2014-02-04 |
| |/ / | |||
* | | | Merge pull request #531 from dokuwiki-translate/lang_update_10 | Andreas Gohr | 2014-02-04 |
|\ \ \ | | | | | | | | | Translation update (sl) | ||
| * | | | translation update | matej | 2014-02-04 |
| |/ / | |||
* | | | updated copyright year | Andreas Gohr | 2014-02-03 |
| | | | |||
* | | | Merge pull request #503 from splitbrain/datepickerlocale | Andreas Gohr | 2014-02-02 |
|\ \ \ | | | | | | | | | localize jQuery UI date picker FS#2912 | ||
| * | | | do not keep zero size files | Andreas Gohr | 2014-01-17 |
| | | | | |||
| * | | | localize jQuery UI date picker FS#2912 | Andreas Gohr | 2014-01-17 |
| | | | | |||
* | | | | Merge pull request #265 from splitbrain/video-audio | Anika Henke | 2014-02-02 |
|\ \ \ \ | | | | | | | | | | | Added video and audio support | ||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2014-02-02 |
| |\ \ \ \ | |||
| * | | | | | fixed html errors in video and audio rendering | Anika Henke | 2014-02-02 |
| | | | | | | |||
| * | | | | | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2014-01-26 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2013-11-02 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2013-08-04 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | added spacing below video and audio elements | Anika Henke | 2013-08-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: The spacing will now show as too much as long as the paragraph bug is not fixed | ||
| * | | | | | | | | refactored audio/video code, removed wrong link around audio | Anika Henke | 2013-08-04 |
| | | | | | | | | | |||
| * | | | | | | | | fixed typo | Anika Henke | 2013-08-04 |
| | | | | | | | | | |||
| * | | | | | | | | added support for html5 audio | Anika Henke | 2013-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 Henke | 2013-08-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type attribute) | ||
| * | | | | | | | | added poster attribute to video if jpg or png with same file name exists | Anika Henke | 2013-08-02 |
| | | | | | | | | | |||
| * | | | | | | | | Add several alternative formats to video for better browser compatibility | Anika Henke | 2013-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) videos | Anika Henke | 2013-08-02 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #505 from splitbrain/fs2915 | Andreas Gohr | 2014-02-02 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | renamed conflicting JavaScript functions FS#2915 | ||
| * | | | | | | | | | renamed conflicting JavaScript functions FS#2915 | Andreas Gohr | 2014-01-17 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge pull request #508 from splitbrain/lessphp52 | Andreas Gohr | 2014-02-02 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FS#2901: Fix lessphp on PHP 5.2.0 | ||
| * | | | | | | | | | FS#2901: Fix lessphp for PHP 5.2.0 | Michael Hamann | 2014-01-19 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge pull request #517 from gamma/master | Andreas Gohr | 2014-02-02 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add the original filename to sendFile for Content-Disposition | ||
| * | | | | | | | | | Re-order parameters to not break other callers | Gerry Weißbach | 2014-01-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs a check for null now. | ||
| * | | | | | | | | | Re-order parameters to not break other callers | Gerry Weißbach | 2014-01-27 |
| | | | | | | | | | | |||
| * | | | | | | | | | nop | Gerry Weißbach | 2014-01-27 |
| | | | | | | | | | | |||
| * | | | | | | | | | Use original filename for Content-Disposition | Gerry Weißbach | 2014-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. | ||
| * | | | | | | | | | Use original filename for Content-Disposition | Gerry Weißbach | 2014-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 Gohr | 2014-02-02 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/PR523: Update tpl_getConf() signature to match plugin::getConf() |