aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x'Tristan Darricau2016-03-161-1/+1
|\ | | | | | | | | * 3.2.x: [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
| * Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-161-1/+1
| |\ | | | | | | | | | | | | * 3.1.x: [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
| | * [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performancerxu2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Swapping conditions in the function accept() of the class \phpbb\recursive_dot_prefix_filter_iterator saves a lot of isDir() calls which is more expensive than $filename[0] checks. PHPBB3-14540
* | | Merge branch '3.2.x'Marc Alexander2016-03-131-1/+1
|\ \ \ | |/ /
| * | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-131-1/+1
| |\ \ | | |/
| | * [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URLSkouat2016-03-121-1/+1
| | | | | | | | | | | | PHPBB3-14533
* | | Merge branch '3.2.x'Máté Bartus2016-03-082-3/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | * 3.2.x: [ticket/14132] Use transaction for adding notifications to type table [ticket/14519] Skip query if all unread notifications are retrieved [ticket/14483] Do not send headers by default on access via controller
| * | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-082-3/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14132] Use transaction for adding notifications to type table [ticket/14519] Skip query if all unread notifications are retrieved [ticket/14483] Do not send headers by default on access via controller Conflicts: phpBB/phpbb/notification/manager.php
| | * Merge pull request #4206 from marc1706/ticket/14519Máté Bartus2016-03-081-1/+3
| | |\ | | | | | | | | [ticket/14519] Skip query if all unread notifications are retrieved
| | | * [ticket/14519] Skip query if all unread notifications are retrievedMarc Alexander2016-03-081-1/+3
| | | | | | | | | | | | | | | | PHPBB3-14519
| | * | Merge pull request #4207 from marc1706/ticket/14132Máté Bartus2016-03-081-0/+4
| | |\ \ | | | | | | | | | | [ticket/14132] Use transaction for adding notifications to type table
| | | * | [ticket/14132] Use transaction for adding notifications to type tableMarc Alexander2016-03-081-0/+4
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent a race condition that might occur by two posts being submitted at the same time with the notification type IDs not being cached. PHPBB3-14132
| | * | Merge pull request #4204 from marc1706/ticket/14483Máté Bartus2016-03-081-3/+6
| | |\ \ | | | |/ | | |/| [ticket/14483] Do not send headers by default on access via controller
| | | * [ticket/14483] Do not send headers by default on access via controllerMarc Alexander2016-03-061-3/+6
| | | | | | | | | | | | | | | | PHPBB3-14483
* | | | Merge branch '3.2.x'Marc Alexander2016-03-071-8/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-071-8/+5
| |\ \ \ | | |/ /
| | * | [ticket/14514] Don't skip users when converting passwordsOliver Schramm2016-03-061-8/+5
| | |/ | | | | | | | | | PHPBB3-14514
* | | Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
|\ \ \ | |/ / | | | | | | | | | * 3.2.x: [ticket/14510] Prevent infinite loop in add_bots task
| * | [ticket/14510] Prevent infinite loop in add_bots taskMáté Bartus2016-03-021-0/+1
| | | | | | | | | | | | PHPBB3-14510
* | | Merge branch '3.2.x'Marc Alexander2016-03-014-2/+142
|\ \ \ | |/ /
| * | Merge pull request #4196 from CHItA/ticket/14487Marc Alexander2016-03-014-2/+142
| |\ \ | | | | | | | | | | | | [ticket/14487] Try to handle connection timeouts
| | * | [ticket/14487] Add missing use statementMáté Bartus2016-02-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14487
| | * | [ticket/14487] Try to handle connection timeoutsMáté Bartus2016-02-283-2/+141
| | | | | | | | | | | | | | | | PHPBB3-14487
* | | | Merge branch '3.2.x'Marc Alexander2016-02-299-21/+479
|\ \ \ \ | |/ / /
| * | | Merge pull request #4194 from Nicofuma/ticket/14499Marc Alexander2016-02-299-21/+479
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14499] Add command to update the board from CLI
| | * | | [ticket/14499] Fix wording and commentsTristan Darricau2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| | * | | [ticket/14499] Add missing config settingsTristan Darricau2016-02-281-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| | * | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-259-21/+476
| | |/ / | | | | | | | | | | | | PHPBB3-14499
* | | | Merge branch '3.2.x'Marc Alexander2016-02-281-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-281-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge pull request #4153 from gn36/ticket/14443Marc Alexander2016-02-281-1/+1
| | |\ | | | | | | | | | | | | [ticket/14443] Introduce additional parameter to messenger
| | | * [ticket/14443] Introduce additional parameter to messengerMartin Beckmann2016-02-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14443
* | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-1/+1
|/ / / | | | | | | | | | PHPBB3-14495
* | | [ticket/14489] Fix bug where extension custom compiler pass cannot be found.Mark Shaw2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | This is returning an extra / on my machine which throws off the next code block, and then the class can't be found. PHPBB3-14489
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-182-0/+10
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13681] Invalidate and reset opcache where necessary
| * | Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-182-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13681] Invalidate and reset opcache where necessary * marc1706/ticket/13681: [ticket/13681] Invalidate and reset opcache where necessary
| | * | [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-182-0/+10
| | | | | | | | | | | | | | | | PHPBB3-13681
* | | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-183-26/+20
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14457] Uses a random placeholder to inject css and js
| * | | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
* | | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-181-0/+31
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | Conflicts: build/build.xml phpBB/composer.lock
| * | | Add migration for 3.1.8Joas Schilling2016-02-181-0/+31
| |/ /
* | | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1629-337/+1031
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14462] Try to prevent timeouts in the installer * CHItA/ticket/14462: [ticket/14462] Not show timeout messages in convertors [ticket/14462] Make timeout error translateable [ticket/14462] Update ordering in install db config [ticket/14462] Fix comments [ticket/14462] Fix tests [ticket/14462] Fix CS and typo [ticket/14462] Set instance of db driver for database access using global [ticket/14462] Fix installation in tests [ticket/14462] Refactor tasks to be more modular [ticket/14462] Further speed improvements
| * | | [ticket/14462] Fix commentsMate Bartus2016-02-127-11/+11
| | | | | | | | | | | | | | | | PHPBB3-14462
| * | | [ticket/14462] Fix CS and typoMate Bartus2016-02-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14462
| * | | [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-129-165/+835
| | | | | | | | | | | | | | | | PHPBB3-14462
| * | | [ticket/14462] Further speed improvementsMate Bartus2016-02-1220-173/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cache the secondary container - Only initialize tasks/modules that are being used - Add timeout error message in the AJAX UI PHPBB3-14462