aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-282-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | The result of build_url was falsely un-entitized.
| | | * | | | [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 remote branch 'github-nickvergessen/develop-olympus' into develop-olympusNils Adermann2010-03-261-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * github-nickvergessen/develop-olympus: [develop-olympus] Make this test run on windows with backslash-paths.
| * | | | | | [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/jellydoughnut/56965: [bug/56965] Redirect fails with directory traversal
| * | | | | | [bug/56965] Redirect fails with directory traversalJosh Woody2010-03-221-42/+48
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Correct invalid r10536 with a boolean flag. Note that this fix for the bug will not actually correct the redirects, it will only prevent phpBB from redirecting outside $phpbb_root_path when redirect()'s third argument is not provided.
| | | * | | 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/cs278/58685: [bug/58685] Correct spelling errors in append_sid() comments.
| * | | | | | [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/cs278/58025: [bug/58025] Search robots are now redirected if they send a SID in the request Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | [bug/58025] Search robots are now redirected if they send a SID in the requestChris Smith2010-03-132-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously search robots could stumble upon a board link somewhere on the web containing a SID they'd follow it and end up indexing that page with the SID in the request URI, this fix prevents that by redirecting them to the same URI just without the SID.
* | | | | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
| * | | | | | | [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the ↵Nils Adermann2010-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog.
* | | | | | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes. [feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
| * | | | | | | [feature/memcache-multi-server] Changing format for multiple memcache hosts. ↵mrkurt2010-03-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing code style issues in changes. Host and ports are now represented like this in config: host1/port1,host2/port2,host3/port3
| * | | | | | | [feature/memcache-multi-server] Adding support for multiple memcache servers ↵mrkurt2010-03-181-2/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to acm_memcache.php You can define multiple memcache servers in your config using this format: host::port,host::port,host::port Example: @define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
* | | | | | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-172-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/jellydoughnut/58415: Allow setting parent forums regardless of permission settings. (Bug #58415) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One major issue with the pre-hook so far was partially staged files, because it used filenames for php lint. These changes will make the hook read the file contents from the index instead. Great thanks to David Soria Parra.
| | | | | * | [git-tools] Improvements on prepare-commt-msg hookIgor Wiedler2010-03-131-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare-commit-hook now uses `git symbolic-ref HEAD` instead of reading $GIT_DIR/HEAD directly. This seems to be a more portable solution. Thanks to Chris (cs278/ToonArmy) for the suggestion.
| | | | | * | [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
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Start adding unit tests for bugs you fix! Tests for anything are welcome really. We have to work on these a lot.
| | | | * | [git-tools] pre-commit hook for syntax checkingIgor Wiedler2010-03-101-0/+44
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pre-commit hook utilises PHP's command-line -l (lint) option, which checks for syntax errors. In case of an error the commit is rejected and the error displayed. Testing is welcome.
* | | | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | develop-olympus
| * | | | | Add feature/ support to branchname hookIgor Wiedler2010-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously introduced branchname hook now will also use feature/ branch names, in addition to the existing bug/.
* | | | | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-0/+24
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | develop-olympus
| * | | | Adding a branchname prepare-commit-msg hookIgor Wiedler2010-03-081-0/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git supports several hooks, some of which are client-side. The prepare-commit-msg hook is run right after a `git commit` call, before the editor is opened. This allows the initial message to be altered. This hook will check if the current branch name begins with `bug/`, in which case it will prepend `[$branchname]` to the commit message. This makes it easier to create proper commit messages. http://wiki.phpbb.com/Git#Commit_Messages For more information refer to the hook source.
* | | | 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
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects any forum (i.e. https://myforum/phpBB3/) where: - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/) - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php) - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3) If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=). This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
* | | | 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
|/ / / /