aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4239 from marc1706/ticket/14530Tristan Darricau2016-03-253-2/+9
|\ | | | | | | | | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storage * marc1706/ticket/14530: [ticket/14530] Only generate text again if sig was parsed for storage [ticket/14530] Add accidentally removed sig_parsed flag
| * [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-242-2/+8
| | | | | | | | PHPBB3-14530
| * [ticket/14530] Add accidentally removed sig_parsed flagMarc Alexander2016-03-241-0/+1
| | | | | | | | | | | | | | This was removed by accident previously while moving from the use of the old bbcode class to the generate_test_for_display function. PHPBB3-14530
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ | | | | | | | | | | | | * 3.1.x: [ticket/14290] Correctly use modified since header
| * | [ticket/14290] Correctly use modified since headerMarc Alexander2016-03-241-1/+1
| | | | | | | | | | | | PHPBB3-14290
| * | Merge pull request #4242 from marc1706/ticket/14136Tristan Darricau2016-03-2423-0/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14136] Add back X-UA-Compatible meta tag * marc1706/ticket/14136: [ticket/14136] Add back X-UA-Compatible meta tag
* | \ \ Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-259-14/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14381] Set the mode in message parser to "reparse" * JoshyPHP/ticket/14381: [ticket/14381] Set the mode in message parser to "reparse" [ticket/14495] Updates the version to 3.3.0-a1-dev
| * | | | [ticket/14381] Set the mode in message parser to "reparse"JoshyPHP2016-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default mode is "post". By setting it to something else, all limits pertaining to posts (min/max length, etc...) should be disabled. PHPBB3-14381
| * | | | Merge branch '3.2.x'Marc Alexander2016-03-241-0/+27
| |\ \ \ \
| * \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-231-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 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.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.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 branch '3.2.x'Marc Alexander2016-03-131-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-119-60/+60
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14523] Replace prototype definition with shared services
| * \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-091-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-091-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/13264] Link to post if user can view it [ticket/13264] Do not force approved state if post visibility is known
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-083-14/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.2.x'Tristan Darricau2016-03-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [release-3.2.0-b2] Update versions to 3.2.0-3-dev
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-071-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14510] Prevent infinite loop in add_bots task
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-019-9/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-2912-25/+510
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-02-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14503] Enable superglobals in cli
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-282-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-271-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-271-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-272-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-261-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-2410-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14495
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4237 from Nicofuma/ticket/14555Marc Alexander2016-03-2413-43/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usages
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usagesTristan Darricau2016-03-2413-43/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14555
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4243 from marc1706/ticket/14136-3.2.xTristan Darricau2016-03-2416-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14136] Add back X-UA-Compatible meta tag * marc1706/ticket/14136-3.2.x: [ticket/14136] Add back X-UA-Compatible meta tag
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-2416-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-2423-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously removed without needing to. Adding it back to force users to not emulate the page for previous versions of IE. The imagetoolbar http-equiv tag was not restored as IE does not contain that anymore since IE7. Also, the chome=1 has been removed from the X-UA-Compatible content as ChromeFrame does not receive any further updates since 2014 and is potentially broken. PHPBB3-14136
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14536] Force unix time stamps to be integer
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4222 from marc1706/ticket/14536Tristan Darricau2016-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14536] Force unix time stamps to be integer * marc1706/ticket/14536: [ticket/14536] Force unix time stamps to be integer
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14536] Force unix time stamps to be integerMarc Alexander2016-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure to prevent PHP fatal errors in case the passed timestamp is an empty string or does not evaluate to an integer (i.e. strings like foobar). PHPBB3-14536
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-241-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14051] Restore accidentally removed $topics_count valuerxu2016-03-241-0/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14051
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4227 from Senky/ticket/14318Marc Alexander2016-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14318] Fix SQL error in Notifications Board migration
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14318] Fix SQL error in Notifications Board migrationJakub Senko2016-03-181-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14318
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-241-10/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4238 from RMcGirr83/ticket_14051Marc Alexander2016-03-241-10/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14051] Replace sql array of viewforum sort topics function
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14051] Add table alias and fix types of propertyRichard McGirr2016-03-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14051
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14051] Fix whitespaceRichard McGirr2016-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14051