summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'pull-request-524'Andreas Gohr2014-02-14
|\
| * authldap: handle bad groupkey gracefullyAndreas Gohr2014-02-14
| * Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524Andreas Gohr2014-02-14
| |\
| | * Update auth.phpSteScho2014-02-03
| | * Update auth.phpSteScho2014-01-30
* | | fixed whitespace errors introduced in #535Andreas Gohr2014-02-14
* | | Merge branch 'toolbar' of git://github.com/hafron/dokuwiki into pull-request-535Andreas Gohr2014-02-14
|\ \ \
| * | | megre changesSzymon Olewniczak2014-02-07
| * | | add preventDefault to toolbar buttonsSzymon Olewniczak2014-02-07
* | | | Merge pull request #532 from splitbrain/gittoolAndreas Gohr2014-02-14
|\ \ \ \
| * | | | always fullpath repo dirsAndreas Gohr2014-02-14
| * | | | check for empty repoAndreas Gohr2014-02-05
| * | | | added bin/gittool.php for simpler git management of pluginsAndreas Gohr2014-02-05
* | | | | Merge pull request #502 from splitbrain/multiqsearchAndreas Gohr2014-02-14
|\ \ \ \ \
| * | | | | Use more general name for qsearch outputGerrit Uitslag2014-01-17
| * | | | | move getSearchterm to overrideable methodGerrit Uitslag2014-01-17
| * | | | | Reformat qsearch.jsGerrit Uitslag2014-01-17
| * | | | | Made a jquery function of dw_qsearchGerrit Uitslag2014-01-17
* | | | | | Merge pull request #529 from lisps/TestRequestAndreas Gohr2014-02-14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix content check test caseslisps2014-02-04
* | | | | | adjusted IE detection for smblinksAndreas Gohr2014-02-13
* | | | | | make HTTPclient check for SSL supportAndreas Gohr2014-02-13
* | | | | | Merge pull request #534 from dokuwiki-translate/lang_update_17Anika Henke2014-02-12
|\ \ \ \ \ \
| * | | | | | translation updatekloppel2014-02-07
* | | | | | | HTTPClient: correctly abort a proxy connectionAndreas Gohr2014-02-11
* | | | | | | order seems to matter for phpunit parametersAndreas Gohr2014-02-11
* | | | | | | Merge pull request #537 from dokuwiki-translate/lang_update_19Andreas Gohr2014-02-11
|\ \ \ \ \ \ \
| * | | | | | | translation updateMarina Vladi2014-02-08
| |/ / / / / /
* | | | | | | Merge pull request #539 from dokuwiki-translate/lang_update_32Andreas Gohr2014-02-09
|\ \ \ \ \ \ \
| * | | | | | | translation updateninetailz2014-02-09
| |/ / / / / /
* | | | | | | show verbose info on skipped tests at travisAndreas Gohr2014-02-09
* | | | | | | more robust HTTP testingAndreas Gohr2014-02-09
* | | | | | | always show error on HTTP test failsAndreas Gohr2014-02-09
| |_|_|_|/ / |/| | | | |
* | | | | | renamed code button to monospace FS#2934 and many othersAndreas Gohr2014-02-05
| |_|_|/ / |/| | | |
* | | | | Merge pull request #530 from dokuwiki-translate/lang_update_9Andreas Gohr2014-02-04
|\ \ \ \ \
| * | | | | translation updatematej2014-02-04
| |/ / / /
* | | | | Merge pull request #531 from dokuwiki-translate/lang_update_10Andreas Gohr2014-02-04
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | translation updatematej2014-02-04
| |/ / /
* | | | updated copyright yearAndreas Gohr2014-02-03
* | | | Merge pull request #503 from splitbrain/datepickerlocaleAndreas Gohr2014-02-02
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-08-04
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added spacing below video and audio elementsAnika Henke2013-08-04
| * | | | | | | | | refactored audio/video code, removed wrong link around audioAnika Henke2013-08-04