aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | [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 '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
|/ / /
* | | [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
* | | [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1Nils Adermann2010-11-101-2/+14
| | |
* | | 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
* | | | [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20Igor Wiedler2010-11-102-2/+13
| | | | | | | | | | | | | | | | PHPBB3-9884
* | | | 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 '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 '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 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
| * | | [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.Andreas Fischer2010-11-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9879
| * | | [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.narqelion2010-11-071-6/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | Fixed spelling, punctuation and grammar as well as removed registration specific language from plugin as it can be/is used for form submissions other than registration. PHPBB3-9879
* | | Merge branch 'ticket/bantu/9075' into develop-olympusNils Adermann2010-11-071-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9075: [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
| * | | [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.Andreas Fischer2010-10-301-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When an administrator set a numbers field to default to 'not specified', a SQL error was caused on the registration page because it was tried to insert an empty string into an integer column. Because the column already supports NULL values, empty strings are now converted to NULL for custom profile fields of the type 'Numbers' before insertion into the data table. PHPBB3-9075
* | | Merge branch 'ticket/bantu/9835' into develop-olympusAndreas Fischer2010-11-061-0/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9835: [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
| * | | [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging innarqelion2010-10-281-0/+2
| |/ / | | | | | | | | | | | | | | | This makes subsilver2 consistent with prosilver. PHPBB3-9835
* | | Merge branch 'ticket/bantu/9827' into develop-olympusAndreas Fischer2010-11-062-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9827: [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
| * | | [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.Adam Reyher2010-11-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in phpBB's styles. Emulation should only occur when using IE8 now. PHPBB3-9827
* | | | Merge branch 'ticket/igorw/9850' into develop-olympusAndreas Fischer2010-11-064-1/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/igorw/9850: [ticket/9850] Display upgrade instructions for feature release in acp
| * | | [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-024-1/+18
| |/ / | | | | | | | | | PHPBB3-9850
* | | Merge branch 'task/naderman/mssql-db-tests' into develop-olympusAndreas Fischer2010-11-031-6/+20
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/mssql-db-tests: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers.
| * | [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.Nils Adermann2010-10-251-1/+6
| | | | | | | | | | | | PHPBB3-9868
| * | [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | | | | | | | | | PHPBB3-9868
* | | Merge branch 'ticket/cs278/9061' into develop-olympusAndreas Fischer2010-10-271-19/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9061: [ticket/9061] Simplify conditional statements by reworking the logic. [ticket/9061] Fixed a race condition in queue locking.
| * | | [ticket/9061] Simplify conditional statements by reworking the logic.Chris Smith2010-10-271-12/+18
| | | | | | | | | | | | | | | | PHPBB3-9061
| * | | [ticket/9061] Fixed a race condition in queue locking.Oleg Pudeyev2010-10-271-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed queue locking to cover all queue file operations, in particular the check for queue file existince and inclusion of queue file must be done under one lock. Also refactored queue locking and unlocking into separate methods. PHPBB3-9061
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and ↵Igor Wiedler2010-10-255-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ticket/bantu/9853' into develop-olympus * ticket/bantu/9101: [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. * ticket/bantu/9595: [ticket/9595] List min/max characters indexed by search for mysql_fulltext. * ticket/bantu/9853: [ticket/9853] Change recaptcha theme from default to 'clean'.
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 13:12:02 +0000