summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Release 2014-05-05 "Ponder Stibbons"Guy Brand2014-05-05
|
* Merge branch 'master' into stableGuy Brand2014-05-05
|\
| * Release preparationGuy Brand2014-05-05
| |
| * Merge pull request #675 from splitbrain/depr_dwqsearchAndreas Gohr2014-05-05
| |\ | | | | | | Deprecated dwqsearch updated, no fancy quotes, some phpdocs
| | * no fancy quotes in user manager import descriptionGerrit Uitslag2014-05-05
| | |
| | * add defaults to phpdocs of search universalGerrit Uitslag2014-05-05
| | |
| | * update deprecation stuff for dw_qearchGerrit Uitslag2014-05-05
| |/
| * Merge pull request #618 from splitbrain/cache_and_cachetimeAndreas Gohr2014-05-04
| |\ | | | | | | Fix longstanding issue with cache class & cachetime setting
| | * adjust logic of caching comments for _nocacheChristopher Smith2014-03-17
| | |
| | * put PHPDocs comment back the way it should beChristopher Smith2014-03-16
| | |
| | * Fix longstanding issue with cache class & cachetime settingChristopher Smith2014-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. cachetime setting should only be applied to the cache_renderer class. Previously it was applied to cache_parser (and by extension cache_handler). 2. two special cachetime values, -1 & 0, weren't handled, per FS#2183 To handle the cachetime setting, -1, disable caching, a new property _nocache is added. When that property is true, any cache file must not be used and storecache() should not store any values
| * | Merge pull request #672 from dokuwiki-translate/lang_update_274Andreas Gohr2014-05-04
| |\ \ | | | | | | | | Translation update (ka)
| | * | translation updateLuka Lejava2014-05-03
| | | |
| * | | Merge pull request #671 from dokuwiki-translate/lang_update_273Andreas Gohr2014-05-04
| |\ \ \ | | | | | | | | | | Translation update (fr)
| | * | | translation updateDavid VANTYGHEM2014-05-02
| | |/ /
| * | | Merge pull request #670 from dokuwiki-translate/lang_update_271Andreas Gohr2014-05-04
| |\ \ \ | | |/ / | |/| | Translation update (fr)
| | * | translation updateDavid VANTYGHEM2014-05-02
| |/ /
| * | Merge pull request #669 from splitbrain/validinputsAndreas Gohr2014-04-30
| |\ \ | | | | | | | | #667 - directly get a valid INPUT parameter
| | * | added another test for arraysAndreas Gohr2014-04-30
| | | |
| | * | use new $INPUT->valid() method in feed.phpAndreas Gohr2014-04-30
| | | |
| | * | add new valid() method to $INPUT #667Andreas Gohr2014-04-30
| | | |
| * | | fixed some test inheriting from the wrong parentAndreas Gohr2014-04-30
| |/ /
| * | some updates on phpunit docs and settingsAndreas Gohr2014-04-30
| | |
| * | Merge pull request #664 from dokuwiki-translate/lang_update_259Andreas Gohr2014-04-30
| |\ \ | | | | | | | | Translation update (ko)
| | * | translation updateMyeongjin2014-04-27
| | | |
| * | | Merge pull request #665 from alexlehm/masterAndreas Gohr2014-04-29
| |\ \ \ | | |/ / | |/| | Fix https proxy authentication, the header was missing a colon so that
| | * | Fix https proxy authentication, the header was missing a colon so thatAlex2014-04-29
| |/ / | | | | | | | | | the auth info was not working.
| * | Merge pull request #661 from dokuwiki-translate/lang_update_243Anika Henke2014-04-26
| |\ \ | | | | | | | | Translation update (ko)
| | * | translation updateMyeongjin2014-04-22
| | | |
| * | | Merge pull request #663 from dokuwiki-translate/lang_update_252Michael Hamann2014-04-25
| |\ \ \ | | |/ / | |/| | Translation update (ru)
| | * | translation updateВладимир2014-04-25
| |/ /
| * | Merge pull request #656 from glensc/skip-bzgzAndreas Gohr2014-04-16
| |\ \ | | | | | | | | tar: test. skip instead of error if bz2 or zlib extension is missing
| | * | call parent constructor as wellElan Ruusamäe2014-04-16
| | | |
| | * | run as much as possible (fill extensions conditionally), skip missing ext onceElan Ruusamäe2014-04-14
| | | |
| | * | tar: test. skip instead of error if bz2 or zlib extension is missingElan Ruusamäe2014-04-14
| | | |
| * | | Merge pull request #658 from dokuwiki-translate/lang_update_235Andreas Gohr2014-04-16
| |\ \ \ | | | | | | | | | | Translation update (es)
| | * | | translation updateAntonio Bueno2014-04-16
| | | | |
| * | | | Merge remote-tracking branch 'origin/master'Gerrit Uitslag2014-04-16
| |\| | |
| | * | | Merge pull request #657 from glensc/editorconfigAndreas Gohr2014-04-16
| | |\ \ \ | | | | | | | | | | | | add editorconfig policy
| | | * | | add editorconfig policyElan Ruusamäe2014-04-16
| | | |/ /
| | * | | Merge pull request #655 from dokuwiki-translate/lang_update_230Anika Henke2014-04-16
| | |\ \ \ | | | | | | | | | | | | Translation update (zh)
| | | * | | translation updateqinghao2014-04-12
| | | |/ /
| | * | | Merge pull request #654 from dokuwiki-translate/lang_update_226Anika Henke2014-04-16
| | |\ \ \ | | | |/ / | | |/| | Translation update (es)
| | | * | translation updateEloy2014-04-11
| | |/ /
| * / / use plaintext authornames in diff navigation dropdownsGerrit Uitslag2014-04-16
| |/ /
| * | Merge pull request #651 from dokuwiki-translate/lang_update_221Michael Hamann2014-04-10
| |\ \ | | | | | | | | Translation update (eo)
| | * | translation updateRobert Bogenschneider2014-04-10
| |/ /
| * | fix include_once for JavaScriptAndreas Gohr2014-04-09
| | | | | | | | | | | | the second include was never removed, causing an endless loop.
| * | our code may only throw user errorsAndreas Gohr2014-04-09
| | |
| * | Merge branch 'master' of github.com:splitbrain/dokuwikiAnika Henke2014-04-06
| |\ \