aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/10729' into ticket/10729-2Oliver Schramm2014-07-181-5/+12
|\ | | | | | | | | Conflicts: phpBB/includes/functions_user.php
| * [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | | | | | | | PHPBB3-10729
| * [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
| | | | | | | | PHPBB3-10729
* | Merge pull request #2576 from carlo94it/ticket/12685Tristan Darricau2014-07-174-13/+48
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12685] New CLI container for load extensions * carlo94it/ticket/12685: [ticket/12685] Setup class loader for extensions only if not in safe mode [ticket/12685] Replace getParameterOption with hasParameterOption [ticket/12685] Do not dump container [ticket/12685] Override getDefaultInputDefinition() [ticket/12685] Removed unused USE statement [ticket/12685] Inject console.command_collection instead of the container [ticket/12685] Add a new line [ticket/12685] Container is dumped by default [ticket/12685] Removed spaces [ticket/12685] Add --safe-mode [ticket/12685] We need extensions enabled [ticket/12685] Add space after foreach [ticket/12685] Add console collection and fixing CLI
| * | [ticket/12685] Setup class loader for extensions only if not in safe modeCarlo2014-07-171-3/+6
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Replace getParameterOption with hasParameterOptionCarlo2014-07-151-1/+1
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Do not dump containerCarlo2014-07-151-0/+1
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Override getDefaultInputDefinition()Carlo2014-07-152-9/+19
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Removed unused USE statementCarlo2014-07-151-1/+0
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Inject console.command_collection instead of the containerCarlo2014-07-152-4/+4
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Add a new lineCarlo2014-07-151-0/+1
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Container is dumped by defaultCarlo2014-07-151-1/+0
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Removed spacesCarlo2014-07-151-1/+1
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Add --safe-modeCarlo2014-07-153-2/+20
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] We need extensions enabledCarlo2014-07-121-1/+0
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Add space after foreachCarlo2014-07-121-1/+1
| | | | | | | | | | | | PHPBB3-12685
| * | [ticket/12685] Add console collection and fixing CLICarlo2014-07-122-6/+11
| | | | | | | | | | | | | | | | | | Added a commands service collection and removed CLI container PHPBB3-12685
* | | Merge pull request #2747 from Elsensee/ticket/12860Joas Schilling2014-07-173-0/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12860] Add template events to mcp_ban.html * Elsensee/ticket/12860: [ticket/12860] Fix typo [ticket/12860] Add template events mcp_ban_unban [ticket/12860] Add template events mcp_ban_fields
| * | | [ticket/12860] Fix typoOliver Schramm2014-07-171-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12860
| * | | [ticket/12860] Add template events mcp_ban_unbanOliver Schramm2014-07-163-0/+20
| | | | | | | | | | | | | | | | PHPBB3-12860
| * | | [ticket/12860] Add template events mcp_ban_fieldsOliver Schramm2014-07-163-0/+20
| | | | | | | | | | | | | | | | PHPBB3-12860
* | | | 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
* | | | | [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
* | | | [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-112-2/+2
| | | |
* | | | [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-115-7/+7
| | | |
* | | | 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