aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [git-tools] Use env to find the correct paths to binaries.Chris Smith2010-04-031-2/+2
* [git-tools] Display what parse errors were found.Chris Smith2010-04-031-1/+6
* [git-tools] This script requires bash to run, so point directly to bash.Chris Smith2010-04-031-1/+1
* Merge branch 'develop-olympus' into git-toolsIgor Wiedler2010-03-282-43/+49
|\
| * Merge remote branch 'github-nickvergessen/develop-olympus' into develop-olympusNils Adermann2010-03-261-1/+1
| |\
| | * [develop-olympus] Make this test run on windows with backslash-paths.Joas Schilling2010-03-261-1/+1
| * | Merge branch 'bug/jellydoughnut/56965' into develop-olympusNils Adermann2010-03-261-42/+48
| |\ \ | | |/ | |/|
| | * [bug/56965] Redirect fails with directory traversalJosh Woody2010-03-221-42/+48
* | | Merge branch 'develop-olympus' into git-toolsIgor Wiedler2010-03-225-6/+25
|\| |
| * | Merge branch 'bug/cs278/58685' into develop-olympusNils Adermann2010-03-181-2/+2
| |\ \
| | * | [bug/58685] Correct spelling errors in append_sid() comments.Chris Smith2010-03-181-2/+2
| * | | Merge branch 'bug/cs278/58025' into develop-olympusNils Adermann2010-03-182-0/+7
| |\ \ \
| | * | | [bug/58025] Search robots are now redirected if they send a SID in the requestChris Smith2010-03-132-0/+7
| * | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-0/+1
| |\ \ \ \
| | * | | | [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the ...Nils Adermann2010-03-181-0/+1
| * | | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-2/+12
| |\| | | |
| | * | | | [feature/memcache-multi-server] Changing format for multiple memcache hosts. ...mrkurt2010-03-181-6/+8
| | * | | | [feature/memcache-multi-server] Adding support for multiple memcache servers ...mrkurt2010-03-181-2/+10
| |/ / / /
| * | | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-172-2/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Allow setting parent forums regardless of permission settings. (Bug #58415)Josh Woody2010-03-172-2/+3
* | | | | [git-tools] Improvements for the pre-commit hookIgor Wiedler2010-03-171-5/+28
* | | | | [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