aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-12-071-1/+1
|\
| * [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
* | [ticket/14310] Put progress percentage inside span and make more visibleMarc Alexander2015-12-071-0/+1
* | 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 events.md descriptions, fix accidentally swapped eventsrxu2015-10-129-16/+16
| | * [ticket/14201] Add more template events to ACPrxu2015-09-268-7/+15
| | * [ticket/14201] Add events to acp_users.html, permission_forum_copy.htmlrxu2015-09-262-2/+4
| | * [ticket/14201] Add template events to acp_permissions.htmlrxu2015-09-261-5/+7
* | | Merge branch '3.1.x'Oliver Schramm2015-11-061-0/+7
|\ \ \ | |/ /
| * | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-0/+7
| |\ \
| | * | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-0/+7
* | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-228-1044/+0
* | | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-197-15/+131
|\ \ \ \
| * | | | [ticket/14039] Only show log container when it has contentMate Bartus2015-10-181-1/+3
| * | | | [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-181-1/+1
| * | | | [ticket/14039] Revamp updaterMate Bartus2015-10-176-14/+128
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3647 from marc1706/ticket/13799Tristan Darricau2015-10-191-1/+1
| |\ \ \
| | * | | [ticket/13799] Correctly urlencode category and show selected avatarMarc Alexander2015-05-301-1/+1
* | | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-141-23/+3
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | 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 permissionZoddo2015-09-121-1/+6
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-121-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3921 from Senky/ticket/14187Tristan Darricau2015-10-121-0/+1
| |\ \ \ \
| | * | | | [ticket/14187] Add acp_styles_list_before eventJakub Senko2015-09-231-0/+1
| | | |_|/ | | |/| |
* | | | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-101-1/+7
|\ \ \ \ \
| * | | | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-101-1/+7
* | | | | | 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 managementMatt Friedman2015-09-113-3/+5
| | | |_|/ / | | |/| | |
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-081-0/+2
| |\ \ \ \ \
| | * | | | | [ticket/14219] Add email to inactive user listingRichard McGirr2015-10-081-0/+2
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-082-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3733 from javiexin/ticket/13934Tristan Darricau2015-10-082-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/13934] Add enctype clause for profile fieldsjaviexin2015-06-302-2/+2
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-161-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | [ticket/14154] Add extension composer name as tooltipZoddo2015-09-121-2/+2
| | |_|/ | |/| |
* | | | Merge branch '3.1.x'Marc Alexander2015-08-171-0/+4
|\ \ \ \ | |/ / /
| * | | [ticket/14103] Reset text-decoration in abbr elementcyberalien2015-08-151-0/+4
| | |/ | |/|
* | | 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 eventZoddo2015-07-151-0/+2
* | | | Merge pull request #3514 from CHItA/ticket/13740Tristan Darricau2015-07-276-1/+185
|\ \ \ \
| * | | | [ticket/13740] Replace more spaces with tabsMate Bartus2015-07-247-126/+126
| * | | | [ticket/13740] Separate new installer style templatesMate Bartus2015-07-225-9/+89
| * | | | [ticket/13740] Allow language change in the installerMate Bartus2015-07-221-2/+6
| * | | | [ticket/13740] Add navigation bar support for the installerCHItA2015-07-083-4/+8