aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | | [ticket/14219] Add email to inactive user listingRichard McGirr2015-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ACP. May help in spotting spam accounts quickly PHPBB3-14219
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-082-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13934] Add enctype clause for profile fields
| * | | | | | Merge pull request #3733 from javiexin/ticket/13934Tristan Darricau2015-10-082-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13934] Add enctype clause for profile fields * javiexin/ticket/13934: [ticket/13934] Add enctype clause for profile fields
| | * | | | | [ticket/13934] Add enctype clause for profile fieldsjaviexin2015-06-302-2/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template variable (the same) in all places where profile fields may need an enctype clause in the corresponding forms. PHPBB3-13934
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-161-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * 3.1.x: [ticket/14154] Add extension composer name as tooltip
| * | | | [ticket/14154] Add extension composer name as tooltipZoddo2015-09-121-2/+2
| | |_|/ | |/| | | | | | | | | | PHPBB3-14154
* | | | Merge branch '3.1.x'Marc Alexander2015-08-171-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/theme/stylesheet.css
| * | | [ticket/14103] Reset text-decoration in abbr elementcyberalien2015-08-151-0/+4
| | |/ | |/| | | | | | | PHPBB3-14103
* | | Merge branch '3.1.x'Marc Alexander2015-08-081-0/+2
|\ \ \ | |/ /
| * | Merge pull request #3759 from Zoddo/ticket/14013Marc Alexander2015-08-081-0/+2
| |\ \ | | | | | | | | | | | | [ticket/14013] Add acp_forums_custom_settings event
| | * | [ticket/14013] Add acp_forums_custom_settings eventZoddo2015-07-151-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14013
* | | | Merge pull request #3514 from CHItA/ticket/13740Tristan Darricau2015-07-276-1/+185
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13740] Refactoring installer * CHItA/ticket/13740: (75 commits) [ticket/13740] Reduce number of references in nav provider [ticket/13740] Move handle_language_select calls to the controllers [ticket/13740] Fix infinite config.php check loop [ticket/13740] Move default data settings out of constructors [ticket/13740] Deduplicate container builder's checks [ticket/13740] Use JSON for installer config [ticket/13740] Fix comment [ticket/13740] Use language service in console application [ticket/13740] Fix CS in compatibilty_globals.php [ticket/13740] Fix message element creation in JS [ticket/13740] Replace more spaces with tabs [ticket/13740] Fix CS [ticket/13740] Filter basic directory change attempts in lang change [ticket/13740] Use tabs instead of spaces in JS file [ticket/13740] Add success message when install finished [ticket/13740] Fix $script_path in obtain_data [ticket/13740] Fix is_phpbb_installed() method [ticket/13740] Login admin when install finished [ticket/13740] Enhance server output buffer bypass [ticket/13740] Secure installer config against corrupted config data ...
| * | | | [ticket/13740] Replace more spaces with tabsMate Bartus2015-07-247-126/+126
| | | | | | | | | | | | | | | | | | | | PHPBB3-13740
| * | | | [ticket/13740] Separate new installer style templatesMate Bartus2015-07-225-9/+89
| | | | | | | | | | | | | | | | | | | | PHPBB3-13740
| * | | | [ticket/13740] Allow language change in the installerMate Bartus2015-07-221-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13740
| * | | | [ticket/13740] Add navigation bar support for the installerCHItA2015-07-083-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added various UI elements and texts. [ci skip] PHPBB3-13740