aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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.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
* | [ticket/14510] Prevent infinite loop in add_bots taskMáté Bartus2016-03-021-0/+1
| | | | | | | | PHPBB3-14510
* | 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 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.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/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
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-132-0/+34
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/includes/functions_user.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-131-0/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14409] Update session page info before displaying online list
| | * | | [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-131-0/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-14409
| * | | [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] Correctly remove the web root path in update_web_root_path
| * | | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14440
| * | | [ticket/14440] Correctly remove the web root path in update_web_root_pathTristan Darricau2016-02-041-1/+7
| | | | | | | | | | | | | | | | PHPBB3-14440
* | | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-112-94/+65
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14448] Use guzzle for remote files uploading * marc1706/ticket/14448: [ticket/14448] Correctly pass verify setting if available [ticket/14448] Let user decide if remote upload certs should be checked [ticket/14448] Add new vendor files and dirs to clean task [ticket/14448] Do not try to test remote upload timeout [ticket/14448] Remove no longer needed guzzle 3.9.3 [ticket/14448] Use GuzzleHttp and try to verify certs [ticket/14448] Update composer.json and lock file for guzzlehttp [ticket/14431] Remote avatar uploading [ticket/14431] Remote avatar uploading
| * | | [ticket/14448] Correctly pass verify setting if availableMarc Alexander2016-02-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14448
| * | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-042-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
| * | | [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-031-12/+36
| | | | | | | | | | | | | | | | PHPBB3-14448
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed content length bug Ran composer update PHPBB3-14431
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-103/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the 3.1 way with guzzle Adds guzzle as a dependency Removed a test as it wont wont with guzzle (as far as I know) PHPBB3-14431
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-30 15:59:21 +0000