aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-0/+12
| |\ \ \ \
| | * | | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-131-0/+12
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-072-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-072-2/+2
| |\ \ \ \
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+0
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+2
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-061-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12901] Fix another wrong type hint for $levelJoas Schilling2014-08-031-1/+1
| * | | | | [ticket/12901] Fix type hinting of style $leveljeroendedauw2014-08-031-1/+1
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-281-43/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeusMarc Alexander2014-07-281-43/+12
| |\ \ \ \
| | * | | | [ticket/12891] Replace template loops with 1 loop to reduce generation timeJoas Schilling2014-07-251-43/+12
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-271-1/+9
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12896] Add php event for admin noticesForumhulp.com2014-07-271-1/+9
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-07-0411-30/+30
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascr...Nils Adermann2014-07-0411-30/+30
| |\ \ \
| | * | | [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_extsTristan Darricau2014-06-2611-30/+30
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-291-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-291-6/+6
| |\ \ \ \