Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'toolbar' of git://github.com/hafron/dokuwiki into pull-request-535 | Andreas Gohr | 2014-02-14 |
|\ | | | | | | | | | | | * 'toolbar' of git://github.com/hafron/dokuwiki: megre changes add preventDefault to toolbar buttons | ||
| * | megre changes | Szymon Olewniczak | 2014-02-07 |
| | | |||
| * | add preventDefault to toolbar buttons | Szymon Olewniczak | 2014-02-07 |
| | | |||
* | | Merge pull request #532 from splitbrain/gittool | Andreas Gohr | 2014-02-14 |
|\ \ | | | | | | | added bin/gittool.php for simpler git management of plugins | ||
| * | | always fullpath repo dirs | Andreas Gohr | 2014-02-14 |
| | | | |||
| * | | check for empty repo | Andreas Gohr | 2014-02-05 |
| | | | |||
| * | | added bin/gittool.php for simpler git management of plugins | Andreas Gohr | 2014-02-05 |
| | | | | | | | | | | | | Makes use of the extension plugin | ||
* | | | Merge pull request #502 from splitbrain/multiqsearch | Andreas Gohr | 2014-02-14 |
|\ \ \ | | | | | | | | | dw_qsearch as jQuery function | ||
| * | | | Use more general name for qsearch output | Gerrit Uitslag | 2014-01-17 |
| | | | | |||
| * | | | move getSearchterm to overrideable method | Gerrit Uitslag | 2014-01-17 |
| | | | | |||
| * | | | Reformat qsearch.js | Gerrit Uitslag | 2014-01-17 |
| | | | | |||
| * | | | Made a jquery function of dw_qsearch | Gerrit Uitslag | 2014-01-17 |
| | | | | |||
* | | | | Merge pull request #529 from lisps/TestRequest | Andreas Gohr | 2014-02-14 |
|\ \ \ \ | | | | | | | | | | | fix TestRequest | ||
| * | | | | fix content check test cases | lisps | 2014-02-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | add test case new Input check add global variables to execute | ||
* | | | | | 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 |
| | | | | | | | | |