summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* check permissions in ACL plugin's RPC API component. #1056Andreas Gohr2015-02-24
* Hotfix Release 2014-09-29b "Hrun"Guy Brand2014-12-03
* disable flash uploading by defaultAndreas Gohr2014-12-03
* Hotfix Release 2014-09-29a "Hrun"Guy Brand2014-10-08
* Merge branch 'master' into stableGuy Brand2014-10-08
|\
| * Release preparationGuy Brand2014-10-08
| * Merge pull request #886 from splitbrain/chris_pcre66_bugChristopher Smith2014-10-07
| |\
| | * escaping backslash should be included in split itemsChristopher Smith2014-10-04
| | * Fix for issues 877 & 885 related to a bug in PCRE 6.6Christopher Smith2014-10-03
| * | do not use Accept-Encoding in browser UIDAndreas Gohr2014-10-06
| * | Merge pull request #887 from hanche/fix-lang-noChristopher Smith2014-10-06
| |\ \ | | |/ | |/|
| | * Fix brokan format stringHarald Hanche-Olsen2014-10-05
| |/
* | Release 2014-09-29 "Hrun"Andreas Gohr2014-09-29
* | Merge branch 'master' into stableAndreas Gohr2014-09-29
|\|
| * release preparationsAndreas Gohr2014-09-29
| * Merge pull request #708 from splitbrain/overridablelangstringsAndreas Gohr2014-09-29
| |\
| | * phpdocs parserutilsGerrit Uitslag2014-09-28
| | * improve some scrutinizer issuesGerrit Uitslag2014-09-28
| | * Merge remote-tracking branch 'origin/master' into overridablelangstringsGerrit Uitslag2014-09-28
| | |\
| | * | visibility plugin methodsGerrit Uitslag2014-09-28
| | * | use config cascade for loading of localizationsGerrit Uitslag2014-09-28
| | * | reformatting config cascadeGerrit Uitslag2014-09-27
| | * | add lang files to cascadingGerrit Uitslag2014-09-27
| | * | extend lang file cascade, so users can override some lang stringsGerrit Uitslag2014-05-13
| * | | Merge pull request #624 from lisps/revisionsAndreas Gohr2014-09-29
| |\ \ \
| | * | | parse AT parameter: first strtotime then timestamplisps2014-09-29
| | * | | fix scrutinizer issueslisps2014-09-26
| | * | | Merge remote-tracking branch master into revisionslisps2014-09-26
| | |\ \ \
| | * | | | fix config optionlisps2014-03-19
| | * | | | add config date_at_formatlisps2014-03-19
| | * | | | Merge remote-tracking branch 'remotes/origin/master' into revisions_locallisps2014-03-19
| | |\ \ \ \
| | * | | | | add missing parameterlisps2014-02-22
| | * | | | | fix check link existence, have to call getLastRevisionAt for every linklisps2014-02-22
| | * | | | | check link existencelisps2014-02-20
| | * | | | | rename classnamelisps2014-02-17
| | * | | | | fix last mergelisps2014-02-17
| | * | | | | Merge remote-tracking branch 'origin/diff_navigation' into revisionslisps2014-02-17
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'splitbrain/diff_navigation' into revisionslisps2013-11-27
| | |\ \ \ \ \ \
| | * | | | | | | change behavior only on date_atlisps2013-11-25
| | * | | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisionslisps2013-11-25
| | |\ \ \ \ \ \ \
| | * | | | | | | | add test for empty rev in ml() and wl()lisps2013-11-22
| | * | | | | | | | rename function _getProperMediaRevision to _getLastMediaRevisionAtlisps2013-11-22
| | * | | | | | | | restore old version of pageinfo()lisps2013-11-22
| | * | | | | | | | localize msglisps2013-11-22
| | * | | | | | | | add test getlastrevisionatlisps2013-11-22
| | * | | | | | | | fix function name media_isexternal()lisps2013-11-22
| | * | | | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisionslisps2013-11-22
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | remove property rev from xhtml.phplisps2013-11-22
| | * | | | | | | | | add parameter at($DATE_AT) and mind revisionslisps2013-11-21
| * | | | | | | | | | Merge pull request #563 from splitbrain/FS#2697searchpagereadonlyAndreas Gohr2014-09-29
| |\ \ \ \ \ \ \ \ \ \