| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ticket/p/9589' into develop-olympus | Andreas Fischer | 2010-07-08 | 1 | -0/+70 |
| |\ | | | | | | | | | * ticket/p/9589: [ticket/9589] Added sample nginx configuration file for phpbb. | ||||
| | * | [ticket/9589] Added sample nginx configuration file for phpbb. | Oleg Pudeyev | 2010-06-10 | 1 | -0/+70 |
| | | | | | | | | | PHPBB3-9589 | ||||
| * | | [ticket/9704] Fix minor typo in coding guidelines. | Igor Wiedler | 2010-07-08 | 1 | -1/+1 |
| |/ | | | | PHPBB3-9704 | ||||
| * | [develop-olympus] Move rxu and nickvergessen to Developers | Joas Schilling | 2010-05-16 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'bug/nickvergessen/9047' into develop-olympus | Nils Adermann | 2010-04-04 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | * bug/nickvergessen/9047: [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047) Conflicts: phpBB/docs/CHANGELOG.html | ||||
| | * | [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047) | Joas Schilling | 2010-04-04 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into ↵ | Nils Adermann | 2010-04-04 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * feature/nickvergessen/unapproved-posts-in-feed: [feature/unapproved-posts-in-feed] Little changelog correction [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed Conflicts: phpBB/docs/CHANGELOG.html | ||||
| | * | | [feature/unapproved-posts-in-feed] Little changelog correction | Joas Schilling | 2010-04-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | [feature/unapproved-posts-in-feed] View note for moderators on unapproved ↵ | Joas Schilling | 2010-04-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | posts/topics with unapproved posts in ATOM Feed | ||||
| * | | | Merge branch 'bug/nickvergessen/9512' into develop-olympus | Nils Adermann | 2010-04-04 | 1 | -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 Schilling | 2010-04-04 | 1 | -0/+1 |
| | | |/ | |/| | | | | | | | prosilver. (Bug #9512) | ||||
| * | | | Merge branch 'bug/nickvergessen/58745' into develop-olympus | Nils Adermann | 2010-04-04 | 1 | -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 message | Joas Schilling | 2010-04-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745) | Joas Schilling | 2010-04-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'bug/nickvergessen/58695' into develop-olympus | Nils Adermann | 2010-04-04 | 1 | -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 Schilling | 2010-04-03 | 1 | -0/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'bug/bantu/9108' into develop-olympus | Nils Adermann | 2010-04-01 | 1 | -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 Fischer | 2010-04-01 | 1 | -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-olympus | Nils Adermann | 2010-04-01 | 1 | -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 Schilling | 2010-03-13 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361 | ||||
| * | | | Merge branch 'bug/kellanved/59425' into develop-olympus | Nils Adermann | 2010-03-28 | 1 | -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 collection | U-H-PC\H | 2010-03-28 | 1 | -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 conform | U-H-PC\H | 2010-03-28 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | The result of build_url was falsely un-entitized. | ||||
| * | | | Merge branch 'bug/cs278/58025' into develop-olympus | Nils Adermann | 2010-03-18 | 1 | -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 request | Chris Smith | 2010-03-13 | 1 | -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 Adermann | 2010-03-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | changelog. | ||||
| * | | | Merge branch 'bug/jellydoughnut/58415' into develop-olympus | Nils Adermann | 2010-03-17 | 1 | -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 Woody | 2010-03-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'bug/dpward/58755' into develop-olympus | Nils Adermann | 2010-03-07 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Adding the bugfix for #58755 to the changelog. | Nils Adermann | 2010-03-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'bug/evil3/12531' into develop-olympus | Nils Adermann | 2010-03-07 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | [bug/12531] proposed solution for bug #12531 | Igor Wiedler | 2010-03-06 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Oops, forgot the changelog for #57105 | Cullen Walsh | 2010-03-06 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into develop-olympus | Nils Adermann | 2010-03-06 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Incrementing the version number to 3.0.7-PL1 | Nils Adermann | 2010-03-05 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Mark the bugfix #58595 as a security fix | Nils Adermann | 2010-03-05 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances. | Andreas Fischer | 2010-03-05 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge branch 'bug/evil3/51555' into develop-olympus | Nils Adermann | 2010-03-06 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | [bug/51555] proposed fix for bug #51555 | Igor Wiedler | 2010-03-06 | 1 | -0/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Mark the bugfix #58595 as a security fix | Nils Adermann | 2010-03-05 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances. | Andreas Fischer | 2010-03-05 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Oops, forgot the changelog for #57105 | Cullen Walsh | 2010-03-02 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855 | Nils Adermann | 2010-03-02 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Missed one half of bug #54855 whoops | Chris Smith | 2010-03-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵ | Nils Adermann | 2010-03-02 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| / | |/ | are no inconsistencies. | ||||
| | * | Merge r10537 into 3.0.7. branch | Andreas Fischer | 2010-02-25 | 1 | -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 Adermann | 2010-02-24 | 1 | -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 Adermann | 2010-02-23 | 1 | -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 Fischer | 2010-02-23 | 1 | -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 branch | Nils Adermann | 2010-02-23 | 1 | -0/+1 |
| | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |