aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-5/+14
|\
| * Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
| |\
| | * [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-201-2/+2
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
| |\ \
| | * | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-061-3/+47
|\ \ \ \ | |/ / /
| * | | Merge pull request #2307 from PayBas/ticket/12408Joas Schilling2014-10-061-3/+47
| |\ \ \
| | * | | [ticket/12408] Fix white-space snifferPayBas2014-09-151-2/+2
| | * | | [ticket/12408] Changed lang vars, added fieldset and removed "default"PayBas2014-09-151-6/+8
| | * | | [ticket/12408] Public functions and updated doc blockPayBas2014-09-151-2/+4
| | * | | [ticket/12408] Code cleanupPayBas2014-09-151-11/+5
| | * | | [ticket/12408] Simplified queriesPayBas2014-09-151-15/+7
| | * | | [ticket/12408] Add quick setting for "default guest style" to ACPPayBas2014-09-151-1/+55
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-012-23/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3013 from VSEphpbb/ticket/13121Joas Schilling2014-10-012-23/+0
| |\ \ \ \
| | * | | | [ticket/13121] Remove cache mode from style management moduleMatt Friedman2014-10-012-23/+0
* | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-10-011-13/+68
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13119] Remove unused globals and use the request classJoas Schilling2014-09-301-12/+11
| * | | | | [ticket/13119] Add events to ACP's ban moduleJoas Schilling2014-09-301-4/+60
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-242-7/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-242-7/+4
| |\ \ \ \
| | * | | | [ticket/12858] Directly return and use timezone selectsMarc Alexander2014-09-172-3/+2
| | * | | | [ticket/12858] Fix timezone display on acp users pageMarc Alexander2014-09-171-2/+0
| | * | | | [ticket/12858] Generate timezone selects with template loopMarc Alexander2014-09-172-3/+3
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-212-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13045] Remove Pragma headersJakub Senko2014-09-172-3/+3
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-051-142/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
| |\ \ \
| | * | | [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | * | | [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-161-1/+1
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-112-40/+40
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascr...Nils Adermann2014-08-112-40/+40
| |\ \ \ \
| | * | | | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-40/+40
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-9/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-111-2/+2
| * | | | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-111-9/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-081-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10404] Fix codesniffer complaint about anonymous functionMarc Alexander2014-08-081-1/+4
| * | | | [ticket/10404] Use anonymous function instead of create_function in acp/authMarc Alexander2014-08-081-1/+1
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #2812 from bantu/ticket/12826Joas Schilling2014-08-071-1/+1
| |\ \ \
| | * | | [ticket/12826] Add optional root namespace indicator for consistency.Andreas Fischer2014-08-071-1/+1
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-5/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-071-5/+41
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/12838] Update RC2 to RC3PayBas2014-07-161-3/+3
| | * | | [ticket/12838] Add raw row-data to acp_ranks core eventPayBas2014-07-101-3/+4
| | * | | [ticket/12838] Add core events to acp_ranks.phpPayBas2014-07-101-5/+40