aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | [ticket/12684] Add doc blocks and test file for user:addLEZY Thomas2016-02-291-1/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | [ticket/12684] Add command user:addLEZY Thomas2016-02-291-0/+167
| | | | | | | | | | | | | | | | | | | | PHPBB3-12684
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-4/+30
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * | | | Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-251-4/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14241] Prevent empty q&a as a result of improper settings * marc1706/ticket/14241: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| | * | | | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-121-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14241
| | * | | | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-111-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improper setup of the q&a captcha in combination with the admin choosing a default language that does not have any questions and answers set might result in the user being presented empty questions and answers. This change will try to fall back to any question in case the admin incorrectly set the default language and has no questions & answers set. If that does not work, the captcha will not allow passing it and suggest to contact the board admin to resolve this issue. PHPBB3-14241
| * | | | | Merge pull request #4242 from marc1706/ticket/14136Tristan Darricau2016-03-241-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-252-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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'Tristan Darricau2016-03-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
| * \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-131-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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.2.x'Marc Alexander2016-03-071-8/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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-014-2/+142
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-299-21/+479
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14495
* | | | | | | | | | | | | | | Merge pull request #4237 from Nicofuma/ticket/14555Marc Alexander2016-03-245-33/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usages
| * | | | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usagesTristan Darricau2016-03-245-33/+26
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14555
* | | | | | | | | | | | | | | Merge pull request #4243 from marc1706/ticket/14136-3.2.xTristan Darricau2016-03-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #4175 from Senky/ticket/14471Marc Alexander2016-03-241-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
| | * | | | | | | | | | | | | [ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before eventJakub Senko2016-03-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14471
* | | | | | | | | | | | | | | 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.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.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