aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2010-11-291-3/+3
|\
| * 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 'develop-olympus' into developNils Adermann2010-11-205-1/+191
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | Merge branch 'prep-release-3.0.8' into develop-olympusNils Adermann2010-11-205-2/+192
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-194-7/+25
| | | |
| | * | 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 'develop-olympus' into developAndreas Fischer2010-11-185-8/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement [develop-olympus] Revert accidental revert of db update lang fix and version [develop-olympus] Remove accidentally added trailing newlines. [develop-olympus] Incrementing the version number to 3.0.9-dev.
| * | | | 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
| | * | [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
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-103-3/+5
|\ \ | |/ | | | | | | | | | | * develop-olympus: [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes. [ticket/9140] Check current board version in incremental update packages [ticket/9891] Updater drops language-selection after database-update
| * [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
| * | [ticket/9891] Updater drops language-selection after database-updateJoas Schilling2010-11-101-1/+1
| |/ | | | | | | PHPBB3-9891
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-101-2/+14
|\ \ | |/ | | | | | | * develop-olympus: [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1
| * [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1Nils Adermann2010-11-101-2/+14
| |
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-101-2/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
| * Merge branch 'ticket/nickvergessen/9886' into develop-olympusNils Adermann2010-11-101-2/+1
| |\ | | | | | | | | | | | | * ticket/nickvergessen/9886: [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
| | * [ticket/9886] Update fails on PostgreSQL because of an error in _add_moduleJoas Schilling2010-11-091-2/+1
| | | | | | | | | | | | PHPBB3-9886
* | | Merge branch 'develop-olympus' into developNils Adermann2010-11-102-2/+13
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
| * | [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20Igor Wiedler2010-11-102-2/+13
| | | | | | | | | | | | PHPBB3-9884
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-0816-128/+564
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9888] Update fails when Bing [Bot] was already added to the users table [develop-olympus] Bumping version number for 3.0.8-RC1. [ticket/9885] Fix extension group name updater. Loop through all languages. [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'. [ticket/9883] Change an American English spelling to British English. [task/phing-build] Correct the path for update package patch files.
| * | Merge branch 'ticket/nickvergessen/9888' into develop-olympusAndreas Fischer2010-11-081-40/+51
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9888: [ticket/9888] Update fails when Bing [Bot] was already added to the users table
| | * | [ticket/9888] Update fails when Bing [Bot] was already added to the users tableJoas Schilling2010-11-081-40/+51
| | |/ | | | | | | | | | | | | | | | Added a check whether the user already exists before we try to add it. PHPBB3-9888
| * | Merge branch 'ticket/bantu/9885' into develop-olympusNils Adermann2010-11-081-24/+46
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/9885: [ticket/9885] Fix extension group name updater. Loop through all languages.
| | * | [ticket/9885] Fix extension group name updater. Loop through all languages.Andreas Fischer2010-11-081-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression introduced by 58dc5a191c0203ea6d98c37df26b0830b3bf8203. The problem is that $user->add_lang() includes language strings from the board root folder instead of the update folder. Because the database updater is run first, the root folder files have not been upgrade yet. Thus, the language strings we're looking for cannot be found. Since the language strings we are looking for have been moved from the install.php language file to acp/attachments.php it should be possible to always find them in either file. When there is an acp/attachments.php file in the update package, it can also be used. We now also loop through all the installed languages as well, because the board could have been installed in a language other than the admin's current language. PHPBB3-9885 PHPBB3-7717
| * | | [develop-olympus] Bumping version number for 3.0.8-RC1.Nils Adermann2010-11-0814-61/+464
| | |/ | |/|
| * | Merge branch 'ticket/sa007/9847' into develop-olympusAndreas Fischer2010-11-081-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/sa007/9847: [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
| | * | [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.SA0072010-11-081-2/+2
| | |/ | | | | | | | | | | | | | | | | | | The word "gauge" was misspelled as "guage". The word "judgement" is preferred over "judgment" in british english. PHPBB3-9847
| * | [ticket/9883] Change an American English spelling to British English.SA0072010-11-081-1/+1
| |/ | | | | | | PHPBB3-9883
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-074-37/+37
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9880] Change "antibot" to "anti-spambot". [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir. [ticket/9880] Changing the term 'CAPTCHA' to something more obvious. [task/phing-build] Automatically trigger build_diff [task/phing-build] Added a build.xml configuration for phing.
| * Merge branch 'ticket/bantu/9880' into develop-olympusAndreas Fischer2010-11-073-36/+36
| |\ | | | | | | | | | | | | | | | * ticket/bantu/9880: [ticket/9880] Change "antibot" to "anti-spambot". [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
| | * [ticket/9880] Change "antibot" to "anti-spambot".Andreas Fischer2010-11-071-1/+1
| | | | | | | | | | | | PHPBB3-9880
| | * [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.Chris Smith2010-11-073-35/+35
| | | | | | | | | | | | PHPBB3-9880
| * | [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.Paul Sohier2010-11-071-1/+1
| |/ | | | | | | PHPBB3-9696
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-071-2/+2
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/9752] Mark unused language variable as such. [ticket/9752] Change reference to 'confirmation code' to be more generic.
| * Merge branch 'ticket/cs278/9752' into develop-olympusNils Adermann2010-11-071-2/+2
| |\ | | | | | | | | | | | | | | | * ticket/cs278/9752: [ticket/9752] Mark unused language variable as such. [ticket/9752] Change reference to 'confirmation code' to be more generic.
| | * [ticket/9752] Mark unused language variable as such.Chris Smith2010-11-071-1/+1
| | | | | | | | | | | | PHPBB3-9752
| | * [ticket/9752] Change reference to 'confirmation code' to be more generic.narqelion2010-11-071-1/+1
| | | | | | | | | | | | | | | | | | Related to 71b35a924f7a5f517e8d07d975582c27813f5797 PHPBB3-9752
* | | Merge branch 'develop-olympus' into developNils Adermann2010-11-072-15/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins. [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency. [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
| | |
| | \
| *-. \ Merge remote branches 'github-bantu/ticket/9879' and ↵Nils Adermann2010-11-072-15/+15
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'github-cs278/ticket/9095' into develop-olympus * github-bantu/ticket/9879: [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency. [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA. * github-cs278/ticket/9095: [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
| | | * [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.narqelion2010-11-071-9/+9
| | |/ | |/| | | | | | | | | | | | | | | | With the addition of CAPTCHA plugins in 3.0.6 a number of language strings need updating to account for non visual based CAPTCHAs. PHPBB3-9095
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 03:30:01 +0000