aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-2/+2
|\
| * [ticket/14848] Add acp_ext_list_disabled/enabled_title_afterJakub Senko2016-11-021-2/+2
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-141-0/+1
|\ \ | |/
| * [ticket/14783] Add template event before custom BBCodes in ACPMatt Friedman2016-09-141-0/+1
* | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-011-0/+1
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-192-2/+27
|\ \ | |/
| * Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-192-2/+27
| |\
| | * [ticket/13716] Remove extra br tag and correct missing closing a html tagRichard McGirr2016-05-161-1/+1
| | * [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-2/+27
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-311-1/+1
|\ \ \ | |/ /
| * | [ticket/14643] Offer latest backup to restore by defaultJakub Senko2016-05-291-1/+1
| |/
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2711-29/+29
| |\
* | \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-2711-29/+29
|\ \ \ | | |/ | |/|
| * | [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-031-1/+1
| * | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-012-4/+4
| * | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-1/+1
| * | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-0611-29/+29
* | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-243-0/+3
|\ \ \ | | |/ | |/|
| * | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-244-0/+4
* | | [ticket/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-172-2/+9
* | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-163-1/+6
* | | [ticket/14315] Tweak location of drop-downMarc Alexander2016-02-161-1/+1
* | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-161-4/+2
* | | [ticket/14315] Correctly set default values and reset valuesMarc Alexander2016-02-162-17/+17
* | | [ticket/14315] Only add role options specified for each groupMarc Alexander2016-02-161-0/+2
* | | [ticket/14462] Make timeout error translateableOliver Schramm2016-02-141-0/+9
* | | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-021-0/+87
|\ \ \
| * | | [ticket/14262] Add error handling and small CS fixesMate Bartus2016-02-021-0/+8
| * | | [ticket/14262] Remove converter template duplicateMate Bartus2016-01-291-134/+0
| * | | [ticket/14262] Move convertor to controllerMate Bartus2016-01-292-0/+213
* | | | [ticket/14438] Allign progressbar text to centerMate Bartus2016-01-291-4/+9
* | | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-3/+6
|/ / /
* | | [ticket/14306] Improves Error displayTristan Darricau2016-01-091-1/+1
* | | [ticket/14306] CS and correctly handle exception loopTristan Darricau2016-01-091-4/+4
* | | [ticket/14306] Update the error messageTristan Darricau2016-01-091-2/+1
* | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-6/+14
* | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ | |/ /
| * | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-071-1/+1
* | | [ticket/14380] Maintain consistent template var paths in 3.2 installerMate Bartus2015-12-222-2/+2
* | | [ticket/14378] Use consistent template variable pathsMarc Alexander2015-12-223-7/+7
* | | Merge branch '3.1.x'Marc Alexander2015-12-223-3/+3
|\ \ \ | |/ /
| * | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-223-3/+3
* | | 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