aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the ↵Nils Adermann2010-03-181-0/+1
| | | | | | | | | | | | changelog.
* | | [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
| | |
* | | 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-065-6/+12
|\ \
| * | 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-055-7/+13
| | |
| * | 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
| | | |
* | | | 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 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
| | | |
* | | | 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
|/ / /
* | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵Nils Adermann2010-03-021-1/+1
|\ \ \ | |/ / |/| / | |/ are no inconsistencies.
| * 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
| * 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
| * #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
| * possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0
| * only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10541 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10537 into 3.0.7. branchAndreas Fischer2010-02-252-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10538 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10528 into 3.0.7: Update: Store expected resulting file contents in ↵Nils Adermann2010-02-242-25/+81
| | | | | | | | | | | | cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Previous version bump commit r10506 was missing schema_data.sql so that has ↵Nils Adermann2010-02-231-2/+2
| | | | | | | | | | | | been updated to 3.0.7-RC2 as well now git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10532 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merging r10514 into 3.0.7: Bugs #53925 and #52085 - Language fixes related ↵Nils Adermann2010-02-232-2/+2
| | | | | | | | | | | | to the quick reply settings git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10531 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to ↵Nils Adermann2010-02-237-3/+72
| | | | | | | | | | | | enable quick reply in all forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10526 into 3.0.7 branch.Andreas Fischer2010-02-232-6/+8
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10515 into 3.0.7 branchNils Adermann2010-02-232-1/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10520 into 3.0.7 branch.Andreas Fischer2010-02-221-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
| * sneak attack merge r10518Chris Smith2010-02-222-1/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Enter stage left: the INTTEXT token (merge)Henry Sudhof2010-02-214-4/+14
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:21:41 +0000