aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x'Marc Alexander2016-03-231-1/+1
|\
| * Merge pull request #4235 from Nicofuma/ticket/14550Marc Alexander2016-03-231-1/+1
| |\ | | | | | | | | | [ticket/14550] Fix the number of characters returned by unique_id()
| | * [ticket/14550] Fix the number of characters returned by unique_id()Tristan Darricau2016-03-231-1/+1
| |/ | | | | | | PHPBB3-14450
* | 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
| | * Merge pull request #4226 from rxu/ticket/14540Tristan Darricau2016-03-161-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance * rxu/ticket/14540: [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'Tristan Darricau2016-03-151-135/+139
|\ \ \ | |/ / | | | | | | | | | | | | * 3.2.x: [ticket/14538] Update dependencies for 3.2.x [ticket/14538] Update composer dependencies
| * | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-150-0/+0
| |\ \ | | |/ | | | | | | * 3.1.x:
| | * Merge pull request #4224 from marc1706/ticket/14538Tristan Darricau2016-03-151-253/+363
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14538] Update composer dependencies * marc1706/ticket/14538: [ticket/14538] Update composer dependencies
| * | \ Merge pull request #4225 from marc1706/ticket/14538-3.2.xTristan Darricau2016-03-151-135/+139
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14538] Update composer dependencies * marc1706/ticket/14538-3.2.x: [ticket/14538] Update dependencies for 3.2.x [ticket/14538] Update composer dependencies
| | * | | [ticket/14538] Update dependencies for 3.2.xMarc Alexander2016-03-151-138/+138
| | | | | | | | | | | | | | | | | | | | PHPBB3-14538
| | * | | Merge branch 'ticket/14538' into ticket/14538-3.2.xMarc Alexander2016-03-151-1/+5
| | |\ \ \ | |/ / / / | | | | _
| | * | [ticket/14538] Update composer dependenciesMarc Alexander2016-03-151-253/+363
| | |/ | | | | | | | | | PHPBB3-14538
* | | Merge branch '3.2.x'Tristan Darricau2016-03-141-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | * 3.2.x: [ticket/14528] Add back itemprop definitions to breadcrumbs [ticket/14528] Update navbar_header.html for valid microdata
| * | Merge pull request #4221 from marc1706/ticket/14528Tristan Darricau2016-03-141-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14528] Update navbar_header.html for valid microdata * marc1706/ticket/14528: [ticket/14528] Add back itemprop definitions to breadcrumbs [ticket/14528] Update navbar_header.html for valid microdata
| | * | [ticket/14528] Add back itemprop definitions to breadcrumbsMarc Alexander2016-03-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14528
| | * | [ticket/14528] Update navbar_header.html for valid microdataC1n2016-03-131-1/+1
| |/ / | | | | | | | | | PHPBB3-14528
* | | 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
| |\ \ | | |/
| | * Merge pull request #4217 from phpbb-fr-com/ticket/14533Marc Alexander2016-03-131-1/+1
| | |\ | | | | | | | | | | | | [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL
| | | * [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-119-60/+60
|\ \ \ | |/ / | | | | | | | | | * 3.2.x: [ticket/14523] Replace prototype definition with shared services
| * | Merge pull request #4209 from marc1706/ticket/14523Máté Bartus2016-03-119-60/+60
| |\ \ | | | | | | | | [ticket/14523] Replace prototype definition with shared services
| | * | [ticket/14523] Replace prototype definition with shared servicesMarc Alexander2016-03-109-60/+60
| | | | | | | | | | | | | | | | PHPBB3-14523
* | | | Merge branch '3.2.x'Tristan Darricau2016-03-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.2.x: [ticket/14529] Stop using --prefer-source for composer
| * | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-111-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * 3.1.x: [ticket/14529] Stop using --prefer-source for composer
| | * | Merge pull request #4216 from marc1706/ticket/14529Tristan Darricau2016-03-111-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14529] Stop using --prefer-source for composer * marc1706/ticket/14529: [ticket/14529] Stop using --prefer-source for composer
| | | * | [ticket/14529] Stop using --prefer-source for composerMarc Alexander2016-03-111-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | The api rate limit has been removed by github. Therefore, we no longer need --prefer-source PHPBB3-14529
* | | | Merge branch '3.2.x'Marc Alexander2016-03-101-0/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-101-0/+6
| |\ \ \ | | |/ /
| | * | Merge pull request #4211 from marc1706/ticket/14422Marc Alexander2016-03-101-0/+6
| | |\ \ | | | | | | | | | | | | | | | [ticket/14422] Support cmd+enter & ctrl+enter for submitting message
| | | * | [ticket/14422] Submit when pressing ctrl or cmd + enterMarc Alexander2016-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14422
| | | * | [ticket/14422] Support cmd+enter for submitting messageCallum Macrae2016-03-101-0/+6
| | |/ / | | | | | | | | | | | | PHPBB3-14422
* | | | Merge branch '3.2.x'Marc Alexander2016-03-101-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #4213 from RMcGirr83/TICKET_13972Marc Alexander2016-03-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13972] Remove hard coded flood check from posting
| | * | | [ticket/13972] Remove hard coded flood check from postingRichard McGirr2016-03-101-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13972
* | | | Merge branch '3.2.x'Marc Alexander2016-03-101-4/+19
|\ \ \ \ | |/ / /
| * | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-101-4/+19
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge pull request #4184 from lavigor/ticket/14486Marc Alexander2016-03-101-4/+19
| | |\ | | | | | | | | | | | | [ticket/14486] Add an event and fix an event in login_box()
| | | * [ticket/14486] Use empty() and move error check.lavigor2016-02-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14486
| | | * [ticket/14486] Add an event and fix an event in login_box()lavigor2016-02-181-4/+19
| | | | | | | | | | | | | | | | PHPBB3-14486
* | | | Merge branch '3.2.x'Tristan Darricau2016-03-090-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| * | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-090-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| | * | Merge pull request #4192 from marc1706/ticket/14496Tristan Darricau2016-03-091-1/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14496] Cache last update of update list instead of using filemtime * marc1706/ticket/14496: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| | | * | [ticket/14496] Destroy update_list_time cache variable on introMarc Alexander2016-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14496
| | | * | [ticket/14496] Cache last update of update list instead of using filemtimeMarc Alexander2016-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14496
* | | | | Merge branch '3.2.x'Marc Alexander2016-03-091-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4208 from CHItA/ticket/13264Marc Alexander2016-03-091-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)
| | * | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)Máté Bartus2016-03-091-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The previous PR broke 3.2 because of different variable names PHPBB3-13264