Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Release 2014-09-29 "Hrun" | Andreas Gohr | 2014-09-29 |
| | |||
* | Merge branch 'master' into stable | Andreas Gohr | 2014-09-29 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (214 commits) release preparations postgresql auth plugin: correct function name parse AT parameter: first strtotime then timestamp remove config option move more strings to lang.php move strings to lang.php add placeholders for create page text phpdocs parserutils improve some scrutinizer issues visibility plugin methods use config cascade for loading of localizations reformatting config cascade add lang files to cascading work around missing gzopen on certain systems #865 translation update fix scrutinizer issues fixed typos in docblock comments do not allow empty passwords clean user credentials from control chars added filter method to INPUT class translation update ... | ||
| * | release preparations | Andreas Gohr | 2014-09-29 |
| | | |||
| * | Merge pull request #708 from splitbrain/overridablelangstrings | Andreas Gohr | 2014-09-29 |
| |\ | | | | | | | extend lang file cascade, so users can override some lang strings | ||
| | * | phpdocs parserutils | Gerrit Uitslag | 2014-09-28 |
| | | | |||
| | * | improve some scrutinizer issues | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | | | | | | | | different types unused vars PHPDocs | ||
| | * | Merge remote-tracking branch 'origin/master' into overridablelangstrings | Gerrit Uitslag | 2014-09-28 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: inc/plugin.php | ||
| | * | | visibility plugin methods | Gerrit Uitslag | 2014-09-28 |
| | | | | |||
| | * | | use config cascade for loading of localizations | Gerrit Uitslag | 2014-09-28 |
| | | | | |||
| | * | | reformatting config cascade | Gerrit Uitslag | 2014-09-27 |
| | | | | |||
| | * | | add lang files to cascading | Gerrit Uitslag | 2014-09-27 |
| | | | | |||
| | * | | extend lang file cascade, so users can override some lang strings | Gerrit Uitslag | 2014-05-13 |
| | | | | | | | | | | | | | | | | Fixes #692 | ||
| * | | | Merge pull request #624 from lisps/revisions | Andreas Gohr | 2014-09-29 |
| |\ \ \ | | | | | | | | | | | date_at support | ||
| | * | | | parse AT parameter: first strtotime then timestamp | lisps | 2014-09-29 |
| | | | | | | | | | | | | | | | | | | | | remove config option | ||
| | * | | | fix scrutinizer issues | lisps | 2014-09-26 |
| | | | | | |||
| | * | | | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
| | |\ \ \ | |||
| | * | | | | fix config option | lisps | 2014-03-19 |
| | | | | | | |||
| | * | | | | add config date_at_format | lisps | 2014-03-19 |
| | | | | | | | | | | | | | | | | | | change translation message | ||
| | * | | | | Merge remote-tracking branch 'remotes/origin/master' into revisions_local | lisps | 2014-03-19 |
| | |\ \ \ \ | |||
| | * | | | | | add missing parameter | lisps | 2014-02-22 |
| | | | | | | | |||
| | * | | | | | fix check link existence, have to call getLastRevisionAt for every link | lisps | 2014-02-22 |
| | | | | | | | |||
| | * | | | | | check link existence | lisps | 2014-02-20 |
| | | | | | | | |||
| | * | | | | | rename classname | lisps | 2014-02-17 |
| | | | | | | | |||
| | * | | | | | fix last merge | lisps | 2014-02-17 |
| | | | | | | | |||
| | * | | | | | Merge remote-tracking branch 'origin/diff_navigation' into revisions | lisps | 2014-02-17 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| | * \ \ \ \ \ | Merge branch 'splitbrain/diff_navigation' into revisions | lisps | 2013-11-27 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | change behavior only on date_at | lisps | 2013-11-25 |
| | | | | | | | | | |||
| | * | | | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions | lisps | 2013-11-25 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | add test for empty rev in ml() and wl() | lisps | 2013-11-22 |
| | | | | | | | | | | |||
| | * | | | | | | | | rename function _getProperMediaRevision to _getLastMediaRevisionAt | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce a bit duplicated code | ||
| | * | | | | | | | | restore old version of pageinfo() | lisps | 2013-11-22 |
| | | | | | | | | | | |||
| | * | | | | | | | | localize msg | lisps | 2013-11-22 |
| | | | | | | | | | | |||
| | * | | | | | | | | add test getlastrevisionat | lisps | 2013-11-22 |
| | | | | | | | | | | |||
| | * | | | | | | | | fix function name media_isexternal() | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove empty rev from ml() rename getProperRevision() to getLastRevisionAt() make getLastRevisionAt() a method of ChangeLog | ||
| | * | | | | | | | | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions | lisps | 2013-11-22 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | remove property rev from xhtml.php | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed variable name $create_time to $modified_time | ||
| | * | | | | | | | | | add parameter at($DATE_AT) and mind revisions | lisps | 2013-11-21 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #563 from splitbrain/FS#2697searchpagereadonly | Andreas Gohr | 2014-09-29 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update text above searchresults, when only read-acl FS#2697 | ||
| | * | | | | | | | | | | move more strings to lang.php | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | move strings to lang.php | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | add placeholders for create page text | Gerrit Uitslag | 2014-09-28 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly | Gerrit Uitslag | 2014-09-28 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt | ||
| | * | | | | | | | | | | Replace part of localized searchtext by placeholder | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | use correct permission level for showing 'create page' text | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Update text above searchresults, when only read-acl FS#2697 | Gerrit Uitslag | 2014-02-21 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'bug865' | Andreas Gohr | 2014-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug865: work around missing gzopen on certain systems #865 | ||
| | * | | | | | | | | | | | work around missing gzopen on certain systems #865 | Andreas Gohr | 2014-09-27 |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| * / | | | | | | | | | | postgresql auth plugin: correct function name | Christopher Smith | 2014-09-29 |
| |/ / / / / / / / / / | |||
| * | | | | | | | | | | Merge pull request #826 from splitbrain/external-video-audio | Andreas Gohr | 2014-09-27 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added support for external video and audio files | ||
| | * | | | | | | | | | | fixed scrutinizer issues | Anika Henke | 2014-08-02 |
| | | | | | | | | | | | |