aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'task/naderman/phing-build' into develop-olympusAndreas Fischer2010-11-081-1/+4
|\ \ \ | | | | | | | | | | | | | | | | * task/naderman/phing-build: [task/phing-build] Correct the path for update package patch files.
| * | | [task/phing-build] Correct the path for update package patch files.Nils Adermann2010-11-081-1/+4
| | | | | | | | | | | | | | | | PHPBB3-9849
* | | | 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
* | | | | Merge branch 'ticket/paul999/9696' into develop-olympusAndreas Fischer2010-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/paul999/9696: [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
| * | | | | [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.Paul Sohier2010-11-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-9696
* | | | | Merge branch 'task/naderman/phing-build' into develop-olympusAndreas Fischer2010-11-074-323/+182
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | * task/naderman/phing-build: [task/phing-build] Automatically trigger build_diff [task/phing-build] Added a build.xml configuration for phing.
| * | | [task/phing-build] Automatically trigger build_diffNils Adermann2010-11-072-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build_diff script generates MOD format change descriptions for language and style files. It is automatically triggered by phin with the correct version numbers now so it does not need to be changed anymore. PHPBB3-9849
| * | | [task/phing-build] Added a build.xml configuration for phing.Nils Adermann2010-10-173-311/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current state of the phing build script allowed the removal of some code from the old packaging process written entirely in PHP. Further simplifcations of the PHP code and additions to the phing build file will follow. PHPBB3-9849
* | | | 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-0310-311/+480
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Split up database tests into SELECT and write operationsNils Adermann2010-10-255-178/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SELECT is based on the user table fixture, write (INSERT/UPDATE/DELETE) is tested using the config table fixture. PHPBB3-9868
| * | | [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.Nils Adermann2010-10-251-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9868
| * | | [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | | | | | | | | | | | | | PHPBB3-9868
| * | | [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connectionsNils Adermann2010-10-251-6/+94
| | | | | | | | | | | | | | | | PHPBB3-9868
| * | | [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.Nils Adermann2010-10-251-51/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first step to simplify the extraction of database specific code parts into separate classes. PHPBB3-9868
| * | | [task/mssql-db-tests] Allow test configuration with environment variables.Nils Adermann2010-10-252-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow execution of the tests with different configurations without having to use the test_config.php file, environment variables of the form PHPBB_TEST_<name> can now be used, e.g. PHPBB_TEST_DBMS to set the variables otherwise expected in test_config.php PHPBB3-9868
| * | | [task/mssql-db-tests] No longer display an error when skipping db tests.Nils Adermann2010-10-253-76/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are run with sqlite by default now anyway, so in the majority of cases the error message explaining how to set up database test running will not be displayed anyway. Database tests are now generally simply skipped if no configuration can be found. The RUNNING_TESTS.txt file explains how to set them up however, and more info is available on the wiki. The get_database_config method was moved from test_case_helpers to database_test_case because it has no general purpose. PHPBB3-9868
| * | | [task/mssql-db-tests] Use a simple getter for test case helpers.Nils Adermann2010-10-252-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling initialisation to then use the member directly seems more complicated than just having a method that returns the instance or creates it if necessary. 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'.
| | | * | | | | [ticket/9853] Change recaptcha theme from default to 'clean'.Andreas Fischer2010-10-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change recaptcha theme to 'clean' to better coordinate with the color schemes of prosilver and subsilver2. The default red theme doesn't really fit prosilver and subsilver2. PHPBB3-9853
| | * | | | | | [ticket/9595] List min/max characters indexed by search for mysql_fulltext.Andreas Fischer2010-10-212-0/+10
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-9595
| * | | | | | [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.Andreas Fischer2010-10-181-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove misleading 'below' from RECAPTCHA_EXPLAIN because recaptcha is actually displayed to the side. PHPBB3-9101
* | | | | | Merge branch 'ticket/naderman/9686' into develop-olympusAndreas Fischer2010-10-252-28/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/naderman/9686: [ticket/9686] Fix mssqlnative database data export
| * | | | | | [ticket/9686] Fix mssqlnative database data exportNils Adermann2010-10-252-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require version 1.1 of the sqlsrv extension anyway so the regular sqlsrv_num_rows can be used instead of buffering the result. The result buffer (class result_mssqlnative) should never automatically free the resource it receives - we consistently close resources using sql_freeresult(). PHPBB3-9686
* | | | | | | Merge branch 'ticket/rxu/9478' into develop-olympusAndreas Fischer2010-10-252-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9478: [ticket/9478] Validate maximum number of allowed recipients per PM value.
| * | | | | | | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-252-0/+15
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* | | | | | | Merge branch 'ticket/igorw/9807' into develop-olympusNils Adermann2010-10-232-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9807: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
| * | | | | | [ticket/9807] Update existing module permissions in databaseIgor Wiedler2010-10-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9807
| * | | | | | [ticket/9807] Hide avatar tab in UCP when avatars are disabledIgor Wiedler2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9807
* | | | | | | Merge branch 'ticket/bantu/9857' into develop-olympusIgor Wiedler2010-10-193-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9857: [ticket/9857] Remove visible $Id$ from phpBB/docs files.
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 13:10:07 +0000