aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | [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
|/ / / / /
* | | | | 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 ↵Cullen Walsh2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | option introduced in phpBB 3.0.6, per bug #57105
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the MIN(smiley_order) to the SELECT column list now, so it can be used for sorting on MySQL 4, but also still works on MSSQL, which the bug was originally about.
| * | | | 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 ↵Nils Adermann2010-03-023-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ / are no inconsistencies.
| * | 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
| | |/ | | | | | | | | | git-svn-id: file:///svn/phpbb/tags/release_3_0_7@10557 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Increment version number to 3.0.7Nils Adermann2010-02-283-3/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10487 into 3.0.7: Make those warnings more consistent.Nils Adermann2010-02-281-3/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10554 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Prepare 3.0.7 releaseNils Adermann2010-02-282-3/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10553 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations ↵Nils Adermann2010-02-281-9/+20
| | | | | | | | | | | | | | | | | | without utf8 support, it only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10552 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10549 into 3.0.7: After generating all packages go through the full ↵Nils Adermann2010-02-272-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | installs and make sure the files do not contain any errors [Bug #58255] 3.0.7-RC2 contains an image file missing one byte (icon_textbox_search.gif) you can take it from an previous phpBB3 release, it was not changed. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10550 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * #58055 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0