aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | [ticket/10767] Revert unconditional unfatality in commit-msg hook.Oleg Pudeyev2012-04-161-3/+18
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic." This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26. PHPBB3-10093 PHPBB3-10767
* | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into ↵Andreas Fischer2012-04-201-16/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10812: [ticket/10812] Disabled register_globals check in PHP 5.4
| * | | [ticket/10812] Disabled register_globals check in PHP 5.4galaxyAbstractor2012-04-201-16/+19
| |/ / | | | | | | | | | | | | | | | Disabled the check for register_globals if PHP version is 5.4+ PHPBB3-10812
* | | Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympusOleg Pudeyev2012-04-193-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9089: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
| * | | [ticket/9089] Add tabindex to pm/topic/post icon-options aswellJoas Schilling2012-02-272-3/+3
| | | | | | | | | | | | | | | | PHPBB3-9089
| * | | [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subjectJoas Schilling2012-02-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also added tabindex 1 to the buttons for adding the recipients. Also note, that duplicated tabindex are fine: http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex PHPBB3-9089
* | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-203-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | | [ticket/10797] language key rank moved to commonDhruv Goel2012-04-203-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key RANK moved from memberlist to common. Removed from mcp language. PHPBB3-10797
| * | | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-162-2/+3
| | |/ | |/| | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympusAndreas Fischer2012-04-121-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10788: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
| * | | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10788
| * | | [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
|/ / / | | | | | | | | | PHPBB3-10788
* | | Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympusNils Adermann2012-04-102-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10774: [ticket/10774] Correctly specify index name when creating unique index on MySQL. [ticket/10774] Add unit tests for UNIQUE index existence and creation.
| * | | [ticket/10774] Correctly specify index name when creating unique index on MySQL.Andreas Fischer2012-04-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10774
| * | | [ticket/10774] Add unit tests for UNIQUE index existence and creation.Andreas Fischer2012-04-101-0/+11
|/ / / | | | | | | | | | PHPBB3-10774
* | | Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympusAndreas Fischer2012-04-083-1/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10561: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed).
| * | | [ticket/10561] Removed extra tabs, changes made to $db->sql_query()Hari Sankar R2012-04-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Substituted $db->sql_query() with _sql() PHPBB3-10561
| * | | [ticket/10561] Changed $temp_style_id to $style_idHari Sankar R2012-04-091-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10561
| * | | [ticket/10561] Added function desc for phpbb_style_is_active()Hari Sankar R2012-04-091-0/+2
| | | | | | | | | | | | | | | | PHPBB3-10561
| * | | [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-092-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10561
| * | | [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-073-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
| * | | [ticket/10561] Added to database_update:database_update_info()Hari Sankar R2012-04-071-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | Updates made to database_update.php PHPBB3-10561
| * | | [ticket/10561] Added section in database_update.phpHari Sankar R2012-04-061-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added section to check for existing users using a deactivated style, and revert it to default style. PHPBB3-10561
| * | | [ticket/10561] Moved and renamed the funtion validate_style().Hari Sankar R2012-04-053-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | Fixed minor changes as suggested by @bantu. PHPBB3-10561