summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into new_css.phpGerry Weißbach2014-12-22
|\
| * Merge remote-tracking branch 'splitbrain/master'Gerry Weißbach2014-12-22
| |\
| | * Merge pull request #973 from micgro42/videoTestAndreas Gohr2014-12-18
| | |\
| | | * Remove stray comment blockMichael Große2014-12-18
| | | * Fix file sizeMichael Große2014-12-18
| | | * Add test for internal video filesMichael Große2014-12-18
| | | * Add tests: known and unknown external video filesMichael Große2014-11-27
| | * | Merge pull request #969 from dokuwiki-translate/lang_update_114Andreas Gohr2014-12-17
| | |\ \
| | | * | translation updateSatoshi Sahara2014-12-17
| | |/ /
| | * | never exit during test runsAndreas Gohr2014-12-17
| | * | fix global environment during test requestsAndreas Gohr2014-12-17
| | * | Merge pull request #968 from dokuwiki-translate/lang_update_109Andreas Gohr2014-12-16
| | |\ \
| | | * | translation updateVitaly Filatenko2014-12-15
| | |/ /
| | * | Merge pull request #964 from dokuwiki-translate/lang_update_94Andreas Gohr2014-12-15
| | |\ \
| | | * | translation updateJaroslav Lichtblau2014-12-13
| | * | | Merge pull request #965 from dokuwiki-translate/lang_update_98Andreas Gohr2014-12-15
| | |\ \ \
| | | * | | translation updateType-kun2014-12-13
| | | |/ /
| | * | | Merge pull request #966 from dokuwiki-translate/lang_update_100Andreas Gohr2014-12-15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | translation updateMyeongjin2014-12-14
| | |/ /
| | * | Merge pull request #963 from dokuwiki-translate/lang_update_91Andreas Gohr2014-12-12
| | |\ \
| | | * | translation updateType-kun2014-12-12
| | |/ /
| | * | Merge pull request #957 from dokuwiki-translate/lang_update_83Andreas Gohr2014-12-12
| | |\ \
| | | * | translation updateSatoshi Sahara2014-12-12
| | * | | Merge pull request #960 from dokuwiki-translate/lang_update_88Andreas Gohr2014-12-12
| | |\ \ \
| | | * | | translation updateJussi Takala2014-12-12
| | | |/ /
| | * | | Merge pull request #959 from dokuwiki-translate/lang_update_87Andreas Gohr2014-12-12
| | |\ \ \
| | | * | | translation updateJussi Takala2014-12-12
| | | |/ /
| | * | | Merge pull request #961 from dokuwiki-translate/lang_update_89Andreas Gohr2014-12-12
| | |\ \ \ | | | |/ / | | |/| |
| | | * | translation updateJaroslav Lichtblau2014-12-12
| | |/ /
| | * | seems we need to do SSL/TLS checks the other way roundAndreas Gohr2014-12-12
| | * | travis config. 5.6 is released and test is fixedAndreas Gohr2014-12-12
| | * | Merge branch 'phpunit-fix' into ssl-fixesAndreas Gohr2014-12-12
| | |\ \
| | | * | use phpunit 4.3.5 until bug is fixedAndreas Gohr2014-12-11
| | * | | set correct peer name when connecting through a SSL tunnel proxyAndreas Gohr2014-12-11
| | * | | prefer TLS for SSL Tunnel connections #915Andreas Gohr2014-12-11
| | |/ /
| | * | check for SSL support in the extension managerAndreas Gohr2014-12-11
| | * | Merge pull request #923 from splitbrain/addLogEntryAndreas Gohr2014-12-11
| | |\ \
| | | * | Make addLogEntry independent of global var INFOGerrit Uitslag2014-11-06
| | * | | add new behaviour: bounceAndreas Gohr2014-12-11
| | * | | offsets are not available for hidden elementsAndreas Gohr2014-12-11
| | * | | fade out search hit colorizationAndreas Gohr2014-12-11
| | * | | animate automatic scrolls and don't scroll to borderAndreas Gohr2014-12-11
| | * | | scroll to current page when opening the sitemapAndreas Gohr2014-12-11
| | * | | Merge pull request #954 from splitbrain/extendconfigcascadeAndreas Gohr2014-12-11
| | |\ \ \
| | | * | | Extendable config cascade for userstyles and userscriptGerrit Uitslag2014-12-10
| | * | | | Merge pull request #952 from dokuwiki-translate/lang_update_76Gerrit Uitslag2014-12-11
| | |\ \ \ \
| | | * | | | translation updateSøren Birk2014-12-11
| | |/ / / /
| | * | | | Merge pull request #946 from dokuwiki-translate/lang_update_60Andreas Gohr2014-12-10
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | translation updateTorpedo2014-12-09
| | * | | | Some PHPDocs media and admin pluginGerrit Uitslag2014-12-10