aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x'Máté Bartus2016-03-082-3/+10
|\
| * Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-082-3/+10
| |\
| | * Merge pull request #4206 from marc1706/ticket/14519Máté Bartus2016-03-081-1/+3
| | |\
| | | * [ticket/14519] Skip query if all unread notifications are retrievedMarc Alexander2016-03-081-1/+3
| | * | Merge pull request #4207 from marc1706/ticket/14132Máté Bartus2016-03-081-0/+4
| | |\ \
| | | * | [ticket/14132] Use transaction for adding notifications to type tableMarc Alexander2016-03-081-0/+4
| | | |/
| | * | 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 controllerMarc Alexander2016-03-061-3/+6
* | | | 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
| | |/
* | | Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
|\ \ \ | |/ /
| * | [ticket/14510] Prevent infinite loop in add_bots taskMáté Bartus2016-03-021-0/+1
* | | 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] Add missing use statementMáté Bartus2016-02-291-0/+1
| | * | [ticket/14487] Try to handle connection timeoutsMáté Bartus2016-02-283-2/+141
* | | | 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] Fix wording and commentsTristan Darricau2016-02-291-1/+1
| | * | | [ticket/14499] Add missing config settingsTristan Darricau2016-02-281-1/+4
| | * | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-259-21/+476
| | |/ /
* | | | 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 messengerMartin Beckmann2016-02-011-1/+1
* | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-1/+1
|/ / /
* | | [ticket/14489] Fix bug where extension custom compiler pass cannot be found.Mark Shaw2016-02-181-1/+1
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-182-0/+10
|\ \ \ | |/ /
| * | Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-182-0/+10
| |\ \
| | * | [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-182-0/+10
* | | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-183-26/+20
|\ \ \ \
| * | | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| * | | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| * | | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| * | | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| * | | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
* | | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-181-0/+31
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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] Fix commentsMate Bartus2016-02-127-11/+11
| * | | [ticket/14462] Fix CS and typoMate Bartus2016-02-121-1/+1
| * | | [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-129-165/+835
| * | | [ticket/14462] Further speed improvementsMate Bartus2016-02-1220-173/+197
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-132-0/+34
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-131-0/+2
| |\ \ \
| | * | | [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-131-0/+2
| | | |/ | | |/|
| * | | [prep-release-3.1.8] Add migration for 3.1.8-RC1Joas Schilling2016-02-131-0/+32
| |/ /
* | | Merge pull request #4160 from Nicofuma/ticket/14440Marc Alexander2016-02-111-1/+8
|\ \ \
| * | | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1