aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12857] Add header/footer distinction for subsilver2 eventsPayBas2014-07-233-7/+8
| | | | PHPBB3-12857
* [ticket/12857] Clarify events.md on difference between PS and SS2 breadcrumbsPayBas2014-07-231-2/+5
| | | | PHPBB3-12857
* [ticket/12857] Add missing template events breadcrumb_prependPayBas2014-07-164-1/+18
| | | | | | To insert links after site-home PHPBB3-12857
* [ticket/12857] Add template events breadcrumbs_before/afterPayBas2014-07-163-0/+20
| | | | PHPBB3-12857
* Merge pull request #2739 from PayBas/ticket/12853Joas Schilling2014-07-161-1/+1
|\ | | | | | | | | | | | | [WIP][ticket/12853] Change navbar ACP from skip- to last-responsive * PayBas/ticket/12853: [ticket/12853] Change navbar ACP from skip- to last-responsive
| * [ticket/12853] Change navbar ACP from skip- to last-responsivePayBas2014-07-161-1/+1
| | | | | | | | PHPBB3-12853
* | Merge pull request #2740 from PayBas/ticket/12845Joas Schilling2014-07-162-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12845] Fix invalid ARIA role for breadcrumbs * PayBas/ticket/12845: [ticket/12845] Remove invalid ARIA role for breadcrumbs
| * | [ticket/12845] Remove invalid ARIA role for breadcrumbsPayBas2014-07-162-2/+2
| |/ | | | | | | PHPBB3-12845
* | Merge pull request #2741 from PayBas/ticket/12837Joas Schilling2014-07-162-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12837] Detect "viewing contact admin page" on viewonline * PayBas/ticket/12837: [ticket/12837] Use else if instead of elseif [ticket/12837] Detect "viewing contact admin page" on viewonline
| * | [ticket/12837] Use else if instead of elseifPayBas2014-07-161-1/+1
| | | | | | | | | | | | PHPBB3-12837
| * | [ticket/12837] Detect "viewing contact admin page" on viewonlinePayBas2014-07-162-1/+15
| |/ | | | | | | PHPBB3-12837
* | Merge pull request #2743 from PayBas/ticket/12859Joas Schilling2014-07-163-1/+33
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons * PayBas/ticket/12859: [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
| * | [ticket/12859] Add template events ucp_pm_viewmessage_post_buttonsPayBas2014-07-163-1/+33
| |/ | | | | | | PHPBB3-12859
* | Merge pull request #2709 from rxu/ticket/12828Joas Schilling2014-07-161-3/+21
|\ \ | |/ |/| | | | | | | | | [ticket/12828] Add ucp_prefs.php common core event * rxu/ticket/12828: [ticket/12828] Add ucp_prefs.php common core event
| * [ticket/12828] Add ucp_prefs.php common core eventrxu2014-07-131-3/+21
| | | | | | | | | | | | | | | | Add common core event at the bottom of the includes/ucp/ucp_prefs.php to allow additional actions (like template variable assignments etc.) before the page load. PHPBB3-12828
* | Merge pull request #2736 from Elsensee/ticket/12854Andreas Fischer2014-07-151-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12854] Don't show contact page link if board emails are disabled * Elsensee/ticket/12854: [ticket/12854] Don't show contact page link if board emails are disabled
| * | [ticket/12854] Don't show contact page link if board emails are disabledOliver Schramm2014-07-151-2/+2
| | | | | | | | | | | | PHPBB3-12854
* | | Merge pull request #2737 from Elsensee/ticket/12855Andreas Fischer2014-07-151-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG * Elsensee/ticket/12855: [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
| * | [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUGOliver Schramm2014-07-151-1/+1
|/ / | | | | | | PHPBB3-12855
* | Merge pull request #2728 from lucifer4o/ticket/12846Andreas Fischer2014-07-141-7/+7
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12846] SQLite3 bug in profilefield_base_migration.php * lucifer4o/ticket/12846: [ticket/12846] SQLite3 bug in profilefield_base_migration.php
| * | [ticket/12846] SQLite3 bug in profilefield_base_migration.phpStanislav Atanasov2014-07-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using profilefield_base_migration.php to create a custom profile field with SQlite3 DBMS returns warning: [phpBB Debug] PHP Warning: in file [ROOT]/phpbb/db/driver/sqlite3.php on line 218: SQLite3Result::fetchArray(): Unable to execute statement: constraint failed This is due passing filed_id and lang_id to the DB driver in unspecified format. As they are always int we should cast them in int to prevent the error message appearance. PHPBB3-12846
* | | Merge pull request #2731 from callumacrae/ticket/12849-2Andreas Fischer2014-07-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12849] Fixed possible ReferenceError in core.js. * callumacrae/ticket/12849-2: [ticket/12849] Fixed possible ReferenceError in core.js.
| * | | [ticket/12849] Fixed possible ReferenceError in core.js.Callum Macrae2014-07-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12849
* | | | Merge pull request #2727 from Nicofuma/ticket/12844Andreas Fischer2014-07-131-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12844] Don't clear $dbpasswd early in connection manager * Nicofuma/ticket/12844: [ticket/12844] Don't clear $dbpasswd early in connection manager
| * | | | [ticket/12844] Don't clear $dbpasswd early in connection managerTristan Darricau2014-07-131-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12844
* | | | | Merge pull request #2725 from Nicofuma/ticket/12842Joas Schilling2014-07-121-10/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/12842] Out of memory issue in code sniffer call for extensions * Nicofuma/ticket/12842: [ticket/12842] Skip parameters without exlicit type
| * | | | [ticket/12842] Skip parameters without exlicit typeTristan Darricau2014-07-121-10/+15
| |/ / / | | | | | | | | | | | | PHPBB3-12842
* | | | Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeusJoas Schilling2014-07-118-39/+142
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-RC2: [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2 [prep-release-3.1.0-RC2] Prepare Changelog [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
| * | | [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-113-5/+5
| | | |
| * | | [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2Joas Schilling2014-07-111-0/+69
| | | |
| * | | [prep-release-3.1.0-RC2] Prepare ChangelogJoas Schilling2014-07-111-29/+32
| | | |
| * | | [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2Joas Schilling2014-07-111-0/+31
| | | |
| * | | [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2Joas Schilling2014-07-116-8/+8
|/ / /
* | | Merge pull request #2723 from nickvergessen/ticket/12839Tristan Darricau2014-07-111-6/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12839] Include update related templates and assets in the package * nickvergessen/ticket/12839: [ticket/12839] Include update related templates and assets in the package
| * | | [ticket/12839] Include update related templates and assets in the packageJoas Schilling2014-07-111-6/+36
| | | | | | | | | | | | | | | | PHPBB3-12839
* | | | Merge pull request #2713 from n-aleha/ticket/12768Andreas Fischer2014-07-115-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation * n-aleha/ticket/12768: [ticket/12768] More fixes in language files [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
| * | | | [ticket/12768] More fixes in language filesn-aleha2014-07-085-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More spaces converted to tabs for identation in language files. PHPBB3-12768
| * | | | [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentationn-aleha2014-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'NOTIFICATION_REPORT_CLOSED' has 3 spaces before the first tab indentation in language/en/common.php. PHPBB3-12768
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-07-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12120] Remove imkingdavid from active authors Conflicts: phpBB/docs/AUTHORS
| * \ \ \ \ Merge pull request #2716 from marc1706/ticket/12120Andreas Fischer2014-07-111-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12120] Remove imkingdavid from active authors * marc1706/ticket/12120: [ticket/12120] Remove imkingdavid from active authors
| | * | | | | [ticket/12120] Remove imkingdavid from active authorsMarc Alexander2014-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12120
* | | | | | | Merge pull request #2701 from Nicofuma/ticket/12818Andreas Fischer2014-07-112-2/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12818] Deleting a log entry in MCP produces a General error * Nicofuma/ticket/12818: [ticket/12818] Use assertGreaterThanOrEqual in the tests [ticket/12818] Don't use the id for i= [ticket/12818] Add tests [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
| * | | | | | | [ticket/12818] Use assertGreaterThanOrEqual in the testsTristan Darricau2014-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12818
| * | | | | | | [ticket/12818] Don't use the id for i=Tristan Darricau2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12818
| * | | | | | | [ticket/12818] Add testsTristan Darricau2014-07-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12818
| * | | | | | | [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logsTristan Darricau2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12818
* | | | | | | | Merge pull request #2671 from Nicofuma/ticket/12775Andreas Fischer2014-07-1128-478/+915
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12775] Replace functions_container with a container_builder class. * Nicofuma/ticket/12775: (34 commits) [ticket/12775] Set dbal.conn.driver as synthetic during installation [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml [ticket/12775] Inject the connection when created in the container [ticket/12775] Extract the vars later in install/install_update.php [ticket/12775] Rename config_php_handler to config_php_file container_builder [ticket/12775] Set defined_vars as a property of config_php_file [ticket/12775] Fix doc blocks in the container builder [ticket/12775] Remove useless includes of config.php [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class [ticket/12775] Fix comments [ticket/12775] Update doc blocks [ticket/12775] Fix container_builder [ticket/12775] Rename config_php to config_php_file [ticket/12775] Renamed to \phpbb\di\container_builder [ticket/12775] Remove the last include of functions_container [ticket/12775] Fix unit tests [ticket/12775] Add tests for \phpbb\config_php [ticket/12775] Add tests for the container factory [ticket/12775] Use a field instead of a local var in load_config_var() [ticket/12775] Update container and config in install/ ...
| * | | | | | | | [ticket/12775] Set dbal.conn.driver as synthetic during installationTristan Darricau2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
| * | | | | | | | [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.ymlTristan Darricau2014-07-073-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
| * | | | | | | | [ticket/12775] Inject the connection when created in the containerTristan Darricau2014-07-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775