aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [git-tools] Improvements on prepare-commt-msg hookIgor Wiedler2010-03-131-6/+16
* [git-tools] Some pre-commit enhancements, abolish tempfileIgor Wiedler2010-03-111-4/+4
* [git-tools] use mktemp in pre-commit (thanks nn-)Igor Wiedler2010-03-101-2/+1
* Merge branch 'develop-olympus' into git-toolsIgor Wiedler2010-03-1029-0/+1766
|\
| * [develop-olympus] Backported 3.1 unit tests to 3.0.Nils Adermann2010-03-1029-0/+1766
* | [git-tools] pre-commit hook for syntax checkingIgor Wiedler2010-03-101-0/+44
|/
* Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-...Nils Adermann2010-03-081-2/+2
|\
| * Add feature/ support to branchname hookIgor Wiedler2010-03-081-2/+2
* | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-...Nils Adermann2010-03-081-0/+24
|\|
| * Adding a branchname prepare-commit-msg hookIgor Wiedler2010-03-081-0/+24
* | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-072-1/+2
|\ \
| * | Adding the bugfix for #58755 to the changelog.Nils Adermann2010-03-071-0/+1
| * | [bug/58755] Fix a redirection bug that can occur after loginDavid Ward2010-03-071-1/+1
* | | Merge branch 'bug/evil3/12531' into develop-olympusNils Adermann2010-03-072-2/+3
|\ \ \ | |/ / |/| |
| * | [bug/12531] proposed solution for bug #12531Igor Wiedler2010-03-062-2/+3
| * | Oops, forgot the changelog for #57105Cullen Walsh2010-03-061-0/+1
* | | Merge branch 'master' into develop-olympusNils Adermann2010-03-067-9/+15
|\ \ \
| * \ \ Merge commit 'release-3.0.7-PL1'Nils Adermann2010-03-0610-13/+27
| |\ \ \
| | * | | exclude the image file with text in the name from having newlines fixedNils Adermann2010-03-051-1/+1
| | * | | Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-057-10/+16
| | * | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-1/+2
| | * | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.Andreas Fischer2010-03-052-2/+9
* | | | | Merge branch 'bug/evil3/51555' into develop-olympusNils Adermann2010-03-062-1/+2
|\ \ \ \ \
| * | | | | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-062-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bug/bantu/58595' into develop-olympusNils Adermann2010-03-052-2/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-2/+8
| * | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.Andreas Fischer2010-03-052-1/+2
|/ / / /
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-021-0/+1
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-1/+1
|\| | |
| * | | Parse urls in signature taking into account the allow_sig_links config option...Cullen Walsh2010-03-021-1/+1
* | | | Merge branch 'bug/aptx/54945' into develop-olympusNils Adermann2010-03-021-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.Marek A. RuszczyƄski2010-03-021-2/+2
| * | | Missed one half of bug #54855 whoopsChris Smith2010-03-022-1/+2
* | | | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855Nils Adermann2010-03-022-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Missed one half of bug #54855 whoopsChris Smith2010-03-022-1/+2
* | | | Merging master after 3.0.7 release into develop-olympus to make sure there ar...Nils Adermann2010-03-023-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge commit 'release-3.0.7'Nils Adermann2010-03-0210-21/+76
| |\ \
| | * | Tagging the "Run, bugs, run! Bertie is coming!" 3.0.7 release.Nils Adermann2010-02-280-0/+0
| | |/
| | * Increment version number to 3.0.7Nils Adermann2010-02-283-3/+3
| | * Merge r10487 into 3.0.7: Make those warnings more consistent.Nils Adermann2010-02-281-3/+3
| | * Prepare 3.0.7 releaseNils Adermann2010-02-282-3/+3
| | * Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations wi...Nils Adermann2010-02-281-9/+20
| | * Merge r10549 into 3.0.7: After generating all packages go through the full in...Nils Adermann2010-02-272-0/+44
| | * #58055 againHenry Sudhof2010-02-271-2/+2
| | * okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | * possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | * only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | * Merge r10537 into 3.0.7. branchAndreas Fischer2010-02-252-2/+2
| * | Merge commit 'release-3.0.7-RC2'Nils Adermann2010-03-0233-176/+481
| |\ \