aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9954] Remove unneeded never permissionErik Frèrejean2010-12-211-1/+1
| | | | | | | | | The `ROLE_USER_NOAVATAR` role gets a *never* permission assigned for the two "u_masspm*" permissions. Due to this, this role changes behaviour it isn't intended to change. It should assign "no" as is done in the `ROLE_USER_LIMITED` role. PHPBB3-9954
* Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-132-1/+3
|\ | | | | | | | | * ticket/igorw/9924: [ticket/9924] Pass template instance into $template->display hook
| * [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-232-1/+3
| | | | | | | | PHPBB3-9924
* | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
|\ \ | | | | | | | | | | | | * ticket/adamreyher/9928: [ticket/9928] Do not link "login to your board" to the "send statistics" page.
| * | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| | | | | | | | | | | | PHPBB3-9928
* | | Merge branch 'task/naderman/phpdoc' into develop-olympusAndreas Fischer2010-12-132-1/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor.
| * | | [task/phpdoc] Added a phpdoc task to the build processNils Adermann2010-12-131-1/+7
| | | | | | | | | | | | | | | | PHPBB3-9943
| * | | [task/phpdoc] Added a configuration file for phpDocumentor.Nils Adermann2010-12-131-0/+106
| | | | | | | | | | | | | | | | PHPBB3-9943
* | | | Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympusAndreas Fischer2010-12-131-0/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * feature/ChrisTX/acm-wincache: [feature/acm-wincache] Adding caching module for WinCache's User Cache.
| * | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| |/ / / | | | | | | | | | | | | PHPBB3-9942
* | | | Merge branch 'ticket/rxu/9851' into develop-olympusAndreas Fischer2010-12-132-22/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/rxu/9851: [ticket/9851] "Search new posts" should require login.
| * | | [ticket/9851] "Search new posts" should require login.rxu2010-12-132-22/+35
|/ / / | | | | | | | | | | | | | | | The newposts search uses user_lastvisit, so it should require user to log in. PHPBB3-9851
* | | Merge branch 'ticket/igorw/9939' into develop-olympusChris Smith2010-12-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/igorw/9939: [ticket/9939] Fix JavaScript error in admin recaptcha template
| * | | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
|/ / / | | | | | | | | | PHPBB3-9939
* | | Merge branch 'ticket/adamreyher/9575' into develop-olympusIgor Wiedler2010-12-055-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9575: [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/9575] Change 'administrate' to 'administer'
| * | | [ticket/9575] Also change 'administrate' to 'administer' in templatesIgor Wiedler2010-12-052-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9575
| * | | [ticket/9575] Change 'administrate' to 'administer'Adam Reyher2010-12-013-3/+3
| | | | | | | | | | | | | | | | PHPBB3-9575
* | | | Merge branch 'ticket/rmgcirr83/8736' into develop-olympusIgor Wiedler2010-12-051-1/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/rmgcirr83/8736: [ticket/8736] guest can have 255 chars long username
| * | | [ticket/8736] guest can have 255 chars long usernameRMcGirr832010-12-041-1/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | when you post as a guest (anonymous) you can fill the field username with 255 chars. that will destroy the prosilver and subsilver2 style at viewtopic. settings for username in ACP: 6-16 Chars PHPBB3-8736
* | | Merge branch 'ticket/nickvergessen/9930' into develop-olympusAndreas Fischer2010-12-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9930: [ticket/9930] Redirect failes with open_basedir enabled.
| * | | [ticket/9930] Redirect failes with open_basedir enabled.Joas Schilling2010-11-251-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | Open_basedir does not allow file_exists() for "." and directories without a trayling-slash. Therefor we must append it on the check. PHPBB3-9930
* | | Merge branch 'ticket/igorw/9910' into develop-olympusAndreas Fischer2010-12-031-0/+3
|\ \ \ | | | | | | | | | | | | | | | | * ticket/igorw/9910: [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | | [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMsIgor Wiedler2010-11-211-0/+3
| | | | | | | | | | | | | | | | PHPBB3-9910
* | | | Merge branch 'ticket/igorw/9932' into develop-olympusAndreas Fischer2010-12-031-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9932: [ticket/9932] Add the Bing bot when converting
| * | | | [ticket/9932] Add the Bing bot when convertingRichard Foote2010-11-291-0/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-9932
* | | | Merge branch 'ticket/mungo/9921' into develop-olympusAndreas Fischer2010-12-031-0/+60
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * ticket/mungo/9921: [ticket/9921] Adding sample configuration file for the lighttpd webserver.
| * | | [ticket/9921] Adding sample configuration file for the lighttpd webserver.Ingo Migliarina2010-12-011-0/+60
|/ / / | | | | | | | | | PHPBB3-9921
* | | Merge branch 'task/github-readme' into develop-olympusIgor Wiedler2010-11-291-0/+20
|\ \ \ | |/ / |/| |
| * | [task/github-readme] Add README file for GitHubIgor Wiedler2010-11-291-0/+20
|/ / | | | | | | PHPBB3-9788
* | Merge branch 'ticket/rmcgirr83/9897' into develop-olympusIgor Wiedler2010-11-211-3/+3
|\ \ | |/ |/|
| * [ticket/9897] A few language fixesRMcGirr832010-11-211-3/+3
| | | | | | | | PHPBB3-9897
* | Merge branch 'prep-release-3.0.8' into develop-olympusNils Adermann2010-11-207-46/+266
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.8: [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelogNils Adermann2010-11-195-10/+28
| | |
| * | Merge branch 'ticket/9903' into prep-release-3.0.8Nils Adermann2010-11-192-0/+172
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/9903: [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
| | * | [ticket/9903] Script for detecting potentially malicious flash bbcodesIgor Wiedler2010-11-191-0/+163
| | | | | | | | | | | | | | | | PHPBB3-9903
| | * | [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.Ruslan Uzdenov2010-11-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fix XSS in Flash-BBcode by validating that the supplied argument is a URL. PHPBB3-9903
| * | | Merge branch 'ticket/igorw/9904' into prep-release-3.0.8Nils Adermann2010-11-191-41/+71
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9904: [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
| | * | | [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.Chris Sfanos2010-11-191-41/+71
| |/ / / | | | | | | | | | | | | PHPBB3-9904
* | | | Merge branch 'prep-release-3.0.8' into develop-olympusAndreas Fischer2010-11-182-3/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | * prep-release-3.0.8: [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement
| * | Merge branch 'ticket/igorw/9509' into prep-release-3.0.8Andreas Fischer2010-11-181-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/igorw/9509: [ticket/9509] Fix a typo and wrong period placement
| | * | [ticket/9509] Fix a typo and wrong period placementIgor Wiedler2010-11-181-2/+2
| | |/ | | | | | | | | | | | | | | | Thanks to Michael C. for spotting this. PHPBB3-9509
| * | Merge branch 'ticket/rmcgirr83/9899' into prep-release-3.0.8Andreas Fischer2010-11-181-1/+2
| |\ \ | | |/ | |/| | | | | | | * ticket/rmcgirr83/9899: [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
| | * [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.RMcGirr832010-11-181-1/+2
| |/ | | | | | | | | | | | | | | | | Change recaptcha theme from default to 'clean' in the ACP to better match the administration control panel. Follow up to d6aa25ede149a2d483b064f5ce96abcf49458ee3. PHPBB3-9899
* | [develop-olympus] Revert accidental revert of db update lang fix and versionNils Adermann2010-11-111-2/+2
| | | | | | | | Really not my day, is it?
* | [develop-olympus] Remove accidentally added trailing newlines.Nils Adermann2010-11-112-8/+8
| |
* | [develop-olympus] Incrementing the version number to 3.0.9-dev.Nils Adermann2010-11-113-5/+5
|/
* [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.Nils Adermann2010-11-101-0/+2
|
* Merge branch 'ticket/nickvergessen/9140' into develop-olympusNils Adermann2010-11-101-2/+2
|\ | | | | | | | | * ticket/nickvergessen/9140: [ticket/9140] Check current board version in incremental update packages
| * [ticket/9140] Check current board version in incremental update packagesJoas Schilling2010-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | We need to use $this->current_version in this case instead of $config['version']. Otherwise the message will be displayed after the database got updated from database_update.php. Using PHPBB_VERSION from includes/constants.php is not the right selection either, because than the message is displayed after the files got updated and are checked one last time. PHPBB3-9140
* | Merge branch 'ticket/nickvergessen/9891' into develop-olympusNils Adermann2010-11-101-1/+1
|\ \ | |/ |/| | | | | * ticket/nickvergessen/9891: [ticket/9891] Updater drops language-selection after database-update