aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * Merge r10473 into the 3.0.7 branch.Josh Woody2010-02-041-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10472 and r10474 into the 3.0.7 branchJosh Woody2010-02-041-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA releaseNils Adermann2010-02-011-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. ↵Andreas Fischer2010-02-251-0/+1
| | | | | | | | | | | | Patch by nn- git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57875 - We have to add the paragraph tags there. Patch by ↵Andreas Fischer2010-02-251-1/+1
| | | | | | | | | | | | HardStyle, Regression from r10096. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10537 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #56965 - Allow redirect() to redirect across directories.Josh Woody2010-02-251-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10536 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Quick reply enable button was merged into 3.0.7: r10491, r10492 and r10529Nils Adermann2010-02-231-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10530 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Update: Store expected resulting file contents in cache and do not suggest ↵Nils Adermann2010-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | further merges if the contents match, also fixes infinite merge loop [Bug #54075] If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue suggesting to merge the same file over and over take the install/install_update.php from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in 3.0.5. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57375 - Do not delete unrelated attachments when deleting empty forums.Andreas Fischer2010-02-231-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10526 89ea8834-ac86-4346-8a33-228a782c2dd0
* | General errors can't be logged if there isn't a database connection, ↵Chris Smith2010-02-221-0/+1
| | | | | | | | | | | | introduced in r9924 #57975 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10518 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Enter stage left: the INTTEXT tokenHenry Sudhof2010-02-211-0/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
* | BBCode parser now uses the user object for all settings rather than taking ↵Nils Adermann2010-02-211-0/+1
| | | | | | | | | | | | some from the template object [Bug #57365] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Firebird based board can now access their global announcements, took a while ↵Chris Smith2010-02-201-0/+1
| | | | | | | | | | | | to discover this one. #57525 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10509 89ea8834-ac86-4346-8a33-228a782c2dd0
* | #57715 - Correct behavior of "force_approved_state" when value is false. Josh Woody2010-02-181-1/+2
| | | | | | | | | | | | (Merging r10507 into branches/phpBB-3_0_0) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10508 89ea8834-ac86-4346-8a33-228a782c2dd0
* | We can put the fix for #57505 into 3.0.7 because we have to regenerate the ↵Andreas Fischer2010-02-181-2/+1
| | | | | | | | | | | | packages with the template changes anyway. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10500 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57755 - Make user_email_hash() function independent from system's ↵Andreas Fischer2010-02-181-0/+1
| | | | | | | | | | | | architecture. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10499 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.Joas Schilling2010-02-171-0/+1
| | | | | | | | | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10496 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Let's fix #57825 in 3.0.7. - r10493Andreas Fischer2010-02-171-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10494 89ea8834-ac86-4346-8a33-228a782c2dd0