aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-021-0/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14262] Move convertor to controller * CHItA/ticket/14262: [ticket/14262] Add error handling and small CS fixes [ticket/14262] Remove converter template duplicate [ticket/14262] Fix stage navigation [ticket/14262] Move convertor to controller
| * | | [ticket/14262] Add error handling and small CS fixesMate Bartus2016-02-021-0/+8
| | | | | | | | | | | | | | | | PHPBB3-14262
| * | | [ticket/14262] Remove converter template duplicateMate Bartus2016-01-291-134/+0
| | | | | | | | | | | | | | | | PHPBB3-14262
| * | | [ticket/14262] Move convertor to controllerMate Bartus2016-01-292-0/+213
| | | | | | | | | | | | | | | | PHPBB3-14262
* | | | [ticket/14438] Allign progressbar text to centerMate Bartus2016-01-291-4/+9
| | | | | | | | | | | | | | | | PHPBB3-14438
* | | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-3/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
* | | [ticket/14306] Improves Error displayTristan Darricau2016-01-091-1/+1
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] CS and correctly handle exception loopTristan Darricau2016-01-091-4/+4
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] Update the error messageTristan Darricau2016-01-091-2/+1
| | | | | | | | | | | | PHPBB3-14306
* | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-6/+14
| | | | | | | | | | | | PHPBB3-14306
* | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size change field size to 64 in these files add new migration file to update the database schema PHPBB3-13180
* | | [ticket/14380] Maintain consistent template var paths in 3.2 installerMate Bartus2015-12-222-2/+2
| | | | | | | | | | | | PHPBB3-14380
* | | [ticket/14378] Use consistent template variable pathsMarc Alexander2015-12-223-7/+7
| | | | | | | | | | | | PHPBB3-14378
* | | Merge branch '3.1.x'Marc Alexander2015-12-223-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/adm/style/installer_footer.html
| * | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-223-3/+3
| | | | | | | | | | | | PHPBB3-14374
* | | Merge branch '3.1.x'Tristan Darricau2015-12-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14346] Do not turn version red if update status is unknown
| * | [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
| | | | | | | | | | | | PHPBB3-14346
* | | [ticket/14310] Put progress percentage inside span and make more visibleMarc Alexander2015-12-071-0/+1
| | | | | | | | | | | | PHPBB3-14310
* | | Merge branch '3.1.x'Marc Alexander2015-11-1011-14/+26
|\ \ \ | |/ /
| * | Merge pull request #3930 from rxu/ticket/14201Marc Alexander2015-11-1011-14/+26
| |\ \ | | | | | | | | | | | | [ticket/14201] Add multiple ACP template events
| | * | [ticket/14201] Add events.md descriptions, fix accidentally swapped eventsrxu2015-10-129-16/+16
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add more template events to ACPrxu2015-09-268-7/+15
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add events to acp_users.html, permission_forum_copy.htmlrxu2015-09-262-2/+4
| | | | | | | | | | | | | | | | PHPBB3-14201
| | * | [ticket/14201] Add template events to acp_permissions.htmlrxu2015-09-261-5/+7
| | | | | | | | | | | | | | | | PHPBB3-14201
* | | | Merge branch '3.1.x'Oliver Schramm2015-11-061-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_captcha.php
| * | | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-0/+7
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/11971] Validate "Spambot countermeasures" settings before saving
| | * | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-0/+7
| | | | | | | | | | | | | | | | PHPBB3-11971
* | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-228-1044/+0
| | | | | | | | | | | | | | | | PHPBB3-14044
* | | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-197-15/+131
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14039] Refactoring the updater * CHItA/ticket/14039: [ticket/14039] Use update helper to include files in container factory [ticket/14039] Fix inclusion logic in update helper [ticket/14039] Fix folder creation and deleted binary file issue [ticket/14039] Fix file check for deleted files [ticket/14039] Fix acp link [ticket/14039] Fix ACP link generation [ticket/14039] Fix constants for the updater [ticket/14039] Include phpBB constants on startup [ticket/14039] Fix migrator's language calls [ticket/14039] Fix misunderstandable comment in the archive file updater [ticket/14039] Use shared language service in the container factory [ticket/14039] Fix filesystem file updater's mkdir usage [ticket/14039] Only show log container when it has content [ticket/14039] Use compatibility globals from the update package [ticket/14039] Use http_exception instead of die() [ticket/14039] Fix T_TEMPLATE_PATH constant [ticket/14039] Fix language constants and comments [ticket/14039] Revamp updater
| * | | | [ticket/14039] Only show log container when it has contentMate Bartus2015-10-181-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Revamp updaterMate Bartus2015-10-176-14/+128
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| * | | Merge pull request #3647 from marc1706/ticket/13799Tristan Darricau2015-10-191-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13799] Do not rawurlencode category in gallery avatar * marc1706/ticket/13799: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| | * | | [ticket/13799] Correctly urlencode category and show selected avatarMarc Alexander2015-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13799
* | | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-141-23/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13789
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14159] Hide version info on ACP if we don't have the permission
| * | | | Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-141-1/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/14159] Hide version info on ACP if we don't have the permission * Zoddo/ticket/14159: [ticket/14159] Hide version info on ACP if we don't have the permission
| | * | | [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also hide a link to an unreachable module (Check phpBB version). We could have simply remove the link to the module, but if the user hasn't the permission to access to the phpBB version check module, I think that he shouldn't view any version information about phpBB. PHPBB3-14159
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14187] Add acp_styles_list_before event
| * | | | Merge pull request #3921 from Senky/ticket/14187Tristan Darricau2015-10-121-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14187] Add acp_styles_list_before event * Senky/ticket/14187: [ticket/14187] Add acp_styles_list_before event
| | * | | | [ticket/14187] Add acp_styles_list_before eventJakub Senko2015-09-231-0/+1
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-14187
* | | | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-101-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14157] Allow to set the alt/title attribute on post icons
| * | | | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14157
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-093-3/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3893 from VSEphpbb/ticket/14155Marc Alexander2015-10-093-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14155] Row highlighting for extension/styles management Conflicts: phpBB/adm/style/acp_ext_list.html
| | * | | | | [ticket/14155] Row highlighting for extension/styles managementMatt Friedman2015-09-113-3/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-14155
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14219] Add email to inactive user listing
| * | | | | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-081-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14219] Add email to inactive user listing * RMcGirr83/ticket_14219: [ticket/14219] Add email to inactive user listing