aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/10892' into develop-olympusAndreas Fischer2012-05-131-9/+13
|\ | | | | | | | | | | | | | | * p/ticket/10892: [ticket/10892] Update wiki link to mediawiki. [ticket/10892] Add empty lines for consistency. [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines. [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
| * [ticket/10892] Update wiki link to mediawiki.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | PHPBB3-10892
| * [ticket/10892] Add empty lines for consistency.Oleg Pudeyev2012-05-111-0/+2
| | | | | | | | | | | | | | | | Some headings had empty lines after them, some did not. Add missing empty lines. PHPBB3-10892
| * [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.Oleg Pudeyev2012-05-111-3/+3
| | | | | | | | PHPBB3-10892
| * [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.Patrick Webster2012-05-111-5/+7
| | | | | | | | PHPBB3-10892
* | Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympusAndreas Fischer2012-05-112-0/+8
|\ \ | | | | | | | | | | | | * naderman/ticket/10492: [ticket/10492] Skip functional tests on PHP 5.2 on travis
| * | [ticket/10492] Skip functional tests on PHP 5.2 on travisNils Adermann2012-05-112-0/+8
|/ / | | | | | | PHPBB3-10492
* | Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympusNils Adermann2012-05-111-1/+1
|\ \ | | | | | | | | | | | | * github-bantu/ticket/10889: [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
| * | [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.Andreas Fischer2012-05-111-1/+1
|/ / | | | | | | PHPBB3-10889
* | Merge remote-tracking branch 'p/ticket/10887' into develop-olympusAndreas Fischer2012-05-112-45/+100
|\ \ | |/ |/| | | | | | | * p/ticket/10887: [ticket/10887] Add spaces. [ticket/10887] Split auto increment test from db tools test.
| * [ticket/10887] Add spaces.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | PHPBB3-10887
| * [ticket/10887] Split auto increment test from db tools test.Oleg Pudeyev2012-05-102-45/+100
| | | | | | | | | | | | | | | | | | | | | | Auto increment test does not need any particular columns and should not depend, in particular, on correct handling of binary data. This commit moves auto increment test into its own file and gives it its own table with a simple schema. PHPBB3-10887
* | Merge PR #785 branch 'Senky/ticket/10835' into develop-olympusOleg Pudeyev2012-05-113-4/+5
|\ \ | |/ |/| | | | | | | | | * Senky/ticket/10835: [ticket/10835] changing "e-mail" to "email" [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry [ticket/10835] fixing misleading message in UCP
| * [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| | | | | | | | PHPBB3-10835
| * [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | | | | | | | PHPBB3-10835
| * [ticket/10835] fixing misleading message in UCPSenky2012-05-013-4/+5
| | | | | | | | PHPBB3-10835
* | Merge PR #725 branch 'Senky/ticket/9896' into develop-olympusOleg Pudeyev2012-05-101-4/+4
|\ \ | | | | | | | | | | | | * Senky/ticket/9896: [ticket/9896] Links changed
| * | [ticket/9896] Links changedSenky2012-05-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Link to languaged updated to http://www.phpbb.com/languages/ Link to styles updated to http://www.phpbb.com/customise/db/styles-2/ Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/ Link to Community Forums updated to http://www.phpbb.com/community/ PHPBB3-9896
* | | Merge PR #799 branch 'bantu/ticket/10881' into develop-olympusOleg Pudeyev2012-05-109-94/+53
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10881: [ticket/10881] Replace old (and unify) file headers in develop files.
| * | | [ticket/10881] Replace old (and unify) file headers in develop files.Andreas Fischer2012-05-109-94/+53
|/ / / | | | | | | | | | | | | | | | | | | | | | This especially also fixes the problem of the copyright symbol being represented using 0xA9, which is neither ASCII nor the appropriate UTF8 byte sequence for the copyright symbol. PHPBB3-10881
* | | Merge remote-tracking branch 'p/ticket/10834' into develop-olympusAndreas Fischer2012-05-092-16/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/10834: [ticket/10843] Backport changes to install language. [ticket/10834] Backport general development language changes to 3.0.
| * | | [ticket/10843] Backport changes to install language.Oleg Pudeyev2012-05-051-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10688 PHPBB3-10843
| * | | [ticket/10834] Backport general development language changes to 3.0.Oleg Pudeyev2012-05-051-12/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10688 PHPBB3-10834
* | | | Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympusAndreas Fischer2012-05-095-104/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10858: [ticket/10858] Move generic row seeking to DBAL [ticket/10858] Tests for row seeking with fetchfield() [ticket/10858] Fix MSSQL Native's row seeking behavior
| * | | | [ticket/10858] Move generic row seeking to DBALPatrick Webster2012-05-084-129/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed from: firebird, mssql_odbc, and mssqlnative PHPBB3-10858
| * | | | [ticket/10858] Tests for row seeking with fetchfield()Patrick Webster2012-05-081-0/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-10858
| * | | | [ticket/10858] Fix MSSQL Native's row seeking behaviorPatrick Webster2012-05-081-3/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | The result_mssqlnative class remains in case someone wants to use it PHPBB3-10858
* | | | Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10860: [ticket/10860] Fixing js error in updater
| * | | | [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing javascript error in side-by-side diff styling in updater: resizing inner block instead of outer block and increasing height by inner/outer block difference. PHPBB3-10860
* | | | Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympusAndreas Fischer2012-05-061-13/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10819: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | | | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10819
| * | | | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10819
| * | | | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used transparent background for unchanged lines Shortened the table headers and make the background grey Added a border between the columns Increased the font size on pre blocks Added Consolas as the first pre font, for Windows users Added wordwrapping for pre blocks PHPBB3-10819
* | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into ↵Andreas Fischer2012-05-051-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10849: [ticket/10849] Added missing helptext for listitem
| * | | | [ticket/10849] Added missing helptext for listitemgalaxyAbstractor2012-04-271-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Added the missing helptext for list item in subsilver2. PHPBB3-10849
* | | | Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympusAndreas Fischer2012-05-011-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * Senky/ticket/10846: [ticket/10846] fixing SQL query bug in acp_main.php
| * | | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
|/ / / | | | | | | | | | PHPBB3-10846
* | | Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympusOleg Pudeyev2012-04-262-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | * galaxyAbstractor/ticket/10836: [ticket/10836] Check if avatar directory is writable after install [ticket/10836] Enable avatars by default at install
| * | | [ticket/10836] Check if avatar directory is writable after installgalaxyAbstractor2012-04-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the avatar directory is writeable after the installation is complete. If it isn't, disable avatars and avatar uploading by default. PHPBB3-10836
| * | | [ticket/10836] Enable avatars by default at installgalaxyAbstractor2012-04-211-2/+2
|/ / / | | | | | | | | | | | | | | | Enables avatars and local avatar upload by default. PHPBB3-10836
* | | Merge remote-tracking branch 'github-noxwizard/ticket/10492' into ↵Nils Adermann2012-04-2111-64/+354
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-noxwizard/ticket/10492: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer
| * | | [ticket/10492] Fix line endingsPatrick Webster2012-04-211-26/+26
| | | | | | | | | | | | | | | | PHPBB3-10492
| * | | [ticket/10492] Backporting functional testsPatrick Webster2012-04-218-0/+251
| | | | | | | | | | | | | | | | PHPBB3-10492
| * | | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-204-64/+103
|/ / / | | | | | | | | | PHPBB3-10492
* | | Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympusNils Adermann2012-04-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * github-dhruv/ticket/10815: [ticket/10815] enables feed feature by default for a fresh install
| * | | [ticket/10815] enables feed feature by default for a fresh installDhruv Goel2012-04-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10815
* | | | Merge remote-tracking branch 'p/ticket/10767' into develop-olympusAndreas Fischer2012-04-201-4/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10767: [ticket/10767] Clarify what happens at the end of the hook. [ticket/10767] Use warning/error language as appropriate. [ticket/10767] Default to non-fatal behavior. [ticket/10767] Revert unconditional unfatality in commit-msg hook.
| * | | | [ticket/10767] Clarify what happens at the end of the hook.Oleg Pudeyev2012-04-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are problems and fatal is true, print that the commit is aborted. If there are problems and fatal is false, print instructions for fixing the commit. PHPBB3-10767
| * | | | [ticket/10767] Use warning/error language as appropriate.Oleg Pudeyev2012-04-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When commit-msg hook is fatal, label the message as an error. When it is not fatal, label the message as a warning. "Syntax error" is still always an error, not sure if this should be changed. PHPBB3-10767
| * | | | [ticket/10767] Default to non-fatal behavior.Oleg Pudeyev2012-04-171-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10767