aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'bug/nickvergessen/9512' into develop-olympusNils Adermann2010-04-041-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/9512: [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/9512] Fix dead link in MCP on reports for global announcements in ↵Joas Schilling2010-04-041-0/+1
| | |/ | |/| | | | | | | prosilver. (Bug #9512)
* | | Merge branch 'bug/nickvergessen/58745' into develop-olympusNils Adermann2010-04-041-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/58745: [bug/58745] Correct changelog message [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/58745] Correct changelog messageJoas Schilling2010-04-031-1/+1
| | | |
| * | | [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)Joas Schilling2010-04-031-0/+1
| | | |
* | | | Merge branch 'bug/nickvergessen/58695' into develop-olympusNils Adermann2010-04-041-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/58695: [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)Joas Schilling2010-04-031-0/+1
| | |/ | |/|
* | | Merge branch 'bug/bantu/9108' into develop-olympusNils Adermann2010-04-011-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/bantu/9108: [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old ↵Andreas Fischer2010-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #58425) The order in the FROM clause is important. The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN. This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
* | | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-011-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * | | [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-131-0/+1
| |/ / | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * bug/kellanved/59425: [bug/59425] Correctly check for double inclusion in captcha garbage collection
| * | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The check to avoid the double inclusion of the captcha factory class in the garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory". TerryE pointed the problem out, thanks!
* | | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-281-0/+1
|/ / / | | | | | | | | | The result of build_url was falsely un-entitized.
* | | Merge branch 'bug/cs278/58025' into develop-olympusNils Adermann2010-03-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-131-0/+1
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-171-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * 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-171-0/+1
| | |
* | | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-071-0/+1
|\ \ \
| * | | Adding the bugfix for #58755 to the changelog.Nils Adermann2010-03-071-0/+1
| | | |
* | | | Merge branch 'bug/evil3/12531' into develop-olympusNils Adermann2010-03-071-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [bug/12531] proposed solution for bug #12531Igor Wiedler2010-03-061-0/+1
| | | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-061-0/+1
| |/ /
* | | Merge branch 'master' into develop-olympusNils Adermann2010-03-061-2/+2
|\ \ \
| * | | Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-051-2/+2
| | | |
| * | | 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-051-1/+8
| | | |
* | | | Merge branch 'bug/evil3/51555' into develop-olympusNils Adermann2010-03-061-0/+1
|\ \ \ \
| * | | | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-061-0/+1
| | |_|/ | |/| |
* | | | 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-051-0/+1
|/ / /
* | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-021-0/+1
| |/ |/|
* | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855Nils Adermann2010-03-021-0/+1
|\ \
| * | Missed one half of bug #54855 whoopsChris Smith2010-03-021-0/+1
| | |
* | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵Nils Adermann2010-03-021-1/+1
|\ \ \ | |/ / |/| / | |/ are no inconsistencies.
| * Merge r10537 into 3.0.7. branchAndreas Fischer2010-02-251-1/+1
| | | | | | | | 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-241-0/+1
| | | | | | | | | | | | 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
| * Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to ↵Nils Adermann2010-02-231-0/+1
| | | | | | | | | | | | 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-231-0/+1
| | | | | | | | 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-231-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
| * sneak attack merge r10518Chris Smith2010-02-221-0/+1
| | | | | | | | 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-211-0/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
| * merge in r10509Chris Smith2010-02-201-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0
| * #57715 - Correct behavior of "force_approved_state" when value is false. Josh Woody2010-02-181-1/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10497 and r10499 into 3.0.7 - #57755Andreas Fischer2010-02-181-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10488 into 3.0.7 branch. #57505Andreas Fischer2010-02-181-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to ↵Joas Schilling2010-02-171-0/+1
| | | | | | | | | | | | | | | | folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10493, r10494 - #57825Andreas Fischer2010-02-171-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10495 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10484 and r10485 into 3.0.7 branch.Andreas Fischer2010-02-081-2/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0