aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | [feature/dbal-tests] Load phpbb-schema after creating the connection to the d...Joas Schilling2010-03-262-3/+53
| | * | | | | | | | [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.Joas Schilling2010-03-264-0/+100
| | * | | | | | | | [feature/dbal-tests] Added database test & refactored test frameworkJoas Schilling2010-03-264-20/+137
| * | | | | | | | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-013-4/+5
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | [bug/59135] Fix open_basedir issues when accessing styles- and language-manag...Joas Schilling2010-03-133-4/+5
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-282-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-282-1/+2
| * | | | | | | | | Merge branch 'bug/kellanved/58465' into develop-olympusNils Adermann2010-03-282-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-282-1/+2
| |/ / / / / / / /
| | | | * | | | | [git-tools] Prepend the branch to the commit message for all branches.Chris Smith2010-04-031-1/+1
| | | | * | | | | [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 branch 'develop-olympus' into git-toolsIgor Wiedler2010-03-225-6/+25
| | | | |\ \ \ \ \
| | | | * | | | | | [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
| | | | |\ \ \ \ \ \
| | | | * | | | | | | [git-tools] pre-commit hook for syntax checkingIgor Wiedler2010-03-101-0/+44
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-03-264-45/+58
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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 '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 'develop-olympus' into developNils Adermann2010-03-181-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 'develop-olympus' into developNils Adermann2010-03-183-4/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | [develop] Failed to merge the template test properly.Nils Adermann2010-03-101-96/+0
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-03-1021-123/+149
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [develop-olympus] Backported 3.1 unit tests to 3.0.Nils Adermann2010-03-1029-0/+1766
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-03-081-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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' into developNils Adermann2010-03-084-3/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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