aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/postgresql-fulltext-search] minor changesDhruv Goel2012-07-053-9/+15
| | | | | | | Some changes in code to get it work against current develop. PosgreSQL Fulltext search works for new install now. PHPBB3-9730
* [feature/postgresql-fulltext-search] Fixed bracesOleg Pudeyev2012-07-051-6/+8
| | | | | | Fixes braces in fulltext_postgres.php to comply with phpbb conventions. PHPBB3-9730
* [feature/postgresql-fulltext-search] Remove closing php tagOleg Pudeyev2012-07-051-2/+0
| | | | PHPBB3-9730
* [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 3.we3b2012-06-081-49/+114
| | | | PHPBB3-9730
* [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 2.wagnerch2012-06-081-52/+24
| | | | PHPBB3-9730
* [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 1.wagnerch2012-06-083-0/+910
| | | | PHPBB3-9730
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-094-104/+43
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [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 Conflicts: tests/dbal/select_test.php
| * [ticket/10858] Move generic row seeking to DBALPatrick Webster2012-05-084-129/+43
| | | | | | | | | | | | Removed from: firebird, mssql_odbc, and mssqlnative 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 branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10860] Fixing js error in updater
| * 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 branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | 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 branch 'develop-olympus' into developAndreas Fischer2012-05-051-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10849] Added missing helptext for listitem
| * | | 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 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10871: [ticket/10871] Delete the unwanted implode
| * | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted the implode that had no reason to be there PHPBB3-10871
* | | | | [ticket/10818] Global Announcements Update Dialog should call exit_handler()Joas Schilling2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10818
* | | | | Merge remote-tracking branch 'mvinny/ticket/10778' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/10778: [ticket/10778] Remove extra space from close link in prosilver smilies window
| * | | | | [ticket/10778] Remove extra space from close link in prosilver smilies windowVinny2012-05-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10778
* | | | | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-016-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10847: [ticket/10847] fixing all misspelled "dependant" to "dependent"
| * | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-306-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10847
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * develop-olympus: [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 #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-2630-144/+144
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
| * | | | [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-1529-143/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | | | Merge PR #771 branch 'develop-olympus' into developOleg Pudeyev2012-04-262-2/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [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 PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings
| * | | | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-10779 PHPBB3-10779
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer Conflicts: phpBB/includes/functions_install.php phpunit.xml.functional tests/bootstrap.php tests/test_framework/phpbb_functional_test_case.php tests/test_framework/phpbb_test_case_helpers.php
| * | | | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-202-27/+53
| | | | | | | | | | | | | | | | | | | | PHPBB3-10492
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10815] enables feed feature by default for a fresh install
| * | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-04-201-16/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10812] Disabled register_globals check in PHP 5.4
| * | | | | 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 #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-199-51/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | | | [ticket/10688] Update install.html for 3.1 and current practices.Oleg Pudeyev2012-04-121-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688
| * | | | | | [ticket/10688] Update readme for 3.1 and current practices.Oleg Pudeyev2012-04-111-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688
| * | | | | | [ticket/10688] Changed version 3.0 to 3.1Shibu Lijack2012-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced phpBB 3.0 to 3.1 in the stylesheets PHPBB-10688