Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/13454] Remove double semi-colons | Marc Alexander | 2016-01-06 | 1 | -1/+1 |
| | | | | PHPBB3-13454 | ||||
* | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 32 | -134/+64 |
| | | | | | | This is part 5 and there is more to come. PHPBB3-13454 | ||||
* | [ticket/13454] Fix code sniffer complaints | Marc Alexander | 2016-01-06 | 2 | -2/+2 |
| | | | | PHPBB3-13454 | ||||
* | [ticket/13454] Fix a few issues introduced by overdeleting stuff | Marc Alexander | 2016-01-06 | 3 | -1/+8 |
| | | | | PHPBB3-13454 | ||||
* | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 35 | -78/+41 |
| | | | | | | Part 4 PHPBB3-13454 | ||||
* | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 5 | -5/+4 |
| | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454 | ||||
* | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 37 | -88/+37 |
| | | | | | | This is part 2 of the pr. PHPBB3-13454 | ||||
* | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 72 | -144/+85 |
| | | | | | | This is the first part of the changes. More to come. PHPBB3-13454 | ||||
* | Merge branch '3.1.x' | Marc Alexander | 2016-01-06 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php | ||||
| * | Merge pull request #4109 from marc1706/ticket/14343 | Marc Alexander | 2016-01-06 | 1 | -1/+1 |
| |\ | | | | | | | | | | [ticket/14343] Added missing $phpbb_dispatcher | ||||
| | * | [ticket/14343] Added missing $phpbb_dispatcher | kasimi | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14343 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-06 | 6 | -19/+38 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4105 from marc1706/ticket/14387 | Marc Alexander | 2016-01-06 | 6 | -19/+38 |
| |\ \ | | | | | | | | | | | | | [ticket/14387] Allow extending avatars by extensions in ACP | ||||
| | * | | [ticket/14387] Fix avatar tests after adding get_config_name method | Marc Alexander | 2016-01-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | PHPBB3-14387 | ||||
| | * | | [ticket/14387] Extend avatar-driver by extension in ACP not possible | javiexin | 2016-01-02 | 3 | -30/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them directly when required. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. Simplified manager interface by reducing unneeded methods. PHPBB3-14387 | ||||
| | * | | [ticket/14387] Extend avatar-driver by extension in ACP not possible | javiexin | 2016-01-02 | 5 | -4/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them within the manager method. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. PHPBB3-14387 | ||||
| | * | | [ticket/14387] Extend avatar-driver by extension in ACP not possible | javiexin | 2016-01-02 | 3 | -1/+16 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Create a driver method to provide the driver config name, and use it within the manager method. Default driver config name is the same as now. But new drivers are able to override the config name with their own. PHPBB3-14387 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-06 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4104 from ErnadoO/ticket/14386 | Marc Alexander | 2016-01-06 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | [ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar | ||||
* | | | Merge pull request #4110 from marc1706/ticket/14386 | Marc Alexander | 2016-01-06 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | | | | | [ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar | ||||
| * | | | [ticket/14386] Use of sys_get_temp_dir() | Erwan Nader | 2016-01-06 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-14386 | ||||
| * | | | Merge remote-tracking branch 'ErnadoO/ticket/14386' into ticket/14386 | Marc Alexander | 2016-01-06 | 0 | -0/+0 |
| |\ \ \ |/ / / / | | | _ | | | | | | | Conflicts: phpBB/includes/functions_upload.php | ||||
| * | | [ticket/14386] Use of sys_get_temp_dir() | Erwan Nader | 2016-01-03 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-14386 | ||||
* | | Merge pull request #4102 from JoshyPHP/ticket/10628 | Marc Alexander | 2016-01-01 | 1 | -0/+25 |
|\ \ | | | | | | | [ticket/10628] http:// prepended to "www." urls | ||||
| * | | [ticket/10628] Added test | JoshyPHP | 2015-12-28 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | Tests that the textarea's content is preserved, that no "http://" is added to the text or to the preview's HTML and that the www URL is linkified PHPBB3-10628 | ||||
* | | | Merge pull request #4103 from JoshyPHP/ticket/12221 | Marc Alexander | 2016-01-01 | 2 | -0/+2 |
|\ \ \ | |/ / |/| | | [ticket/12221] URLs Containing javascript: are Garbled | ||||
| * | | [ticket/12221] Added test | JoshyPHP | 2015-12-28 | 2 | -0/+2 |
|/ / | | | | | | | PHPBB3-12221 | ||||
* | | Merge branch '3.1.x' | Marc Alexander | 2015-12-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge pull request #4100 from marc1706/ticket/14303 | Marc Alexander | 2015-12-26 | 1 | -1/+1 |
| |\ | | | | | | | | | | [ticket/14303] Use UTF8 quotes in app.php lang file | ||||
| | * | [ticket/14303] Use UTF8 quotes in app.php lang file | phpBB España | 2015-12-26 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-14303 | ||||
* | | Merge pull request #4099 from marc1706/ticket/14371 | Marc Alexander | 2015-12-24 | 1 | -1/+1 |
|\ \ | | | | | | | | | | [ticket/14371] Small fix for the quick links alignment | ||||
| * | | [ticket/14371] Small fix for the quick links alignment | Melvin García | 2015-12-24 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-14371 | ||||
* | | Merge pull request #4094 from Nicofuma/ticket/14377 | Marc Alexander | 2015-12-23 | 2 | -0/+41 |
|\ \ | | | | | | | | | | [ticket/14377] Allow extensions to register compiler pass | ||||
| * | | [ticket/14377] Handle new $classname() in the sniffer | Tristan Darricau | 2015-12-23 | 1 | -0/+5 |
| | | | | | | | | | | | | PHPBB3-14377 | ||||
| * | | [ticket/14377] Allow extensions to register compiler pass | Tristan Darricau | 2015-12-22 | 1 | -0/+36 |
| | | | | | | | | | | | | PHPBB3-14377 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2015-12-23 | 1 | -4/+4 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_im.html | ||||
| * | | Merge pull request #4084 from exussum12/ticket/14046 | Marc Alexander | 2015-12-23 | 2 | -10/+9 |
| |\ \ | | | | | | | | | | | | | [ticket/14046] Jabber message incorrect | ||||
| | * | | [ticket/14046] Jabber message incorrect | Scott Dutton | 2015-12-16 | 2 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a Jabber message, the page says the message has been sent when loading the page for the first time, This message should only be shown after the message has actually been sent PHPBB3-14046 | ||||
* | | | | Merge pull request #4096 from CHItA/ticket/14380 | Marc Alexander | 2015-12-22 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | [ticket/14380] Maintain consistent template var paths in 3.2 installer | ||||
| * | | | | [ticket/14380] Maintain consistent template var paths in 3.2 installer | Mate Bartus | 2015-12-22 | 2 | -2/+2 |
|/ / / / | | | | | | | | | | | | | PHPBB3-14380 | ||||
* | | | | Merge pull request #4095 from marc1706/ticket/14378 | Máté Bartus | 2015-12-22 | 4 | -10/+10 |
|\ \ \ \ | | | | | | | | | | | [ticket/14378] Use consistent template variable paths | ||||
| * | | | | [ticket/14378] Use consistent template variable paths | Marc Alexander | 2015-12-22 | 4 | -10/+10 |
|/ / / / | | | | | | | | | | | | | PHPBB3-14378 | ||||
* | | | | Merge branch '3.1.x' | Marc Alexander | 2015-12-22 | 5 | -5/+5 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | Conflicts: phpBB/adm/style/installer_footer.html | ||||
| * | | Merge pull request #4093 from VSEphpbb/ticket/14374 | Marc Alexander | 2015-12-22 | 5 | -5/+5 |
| |\ \ | | | | | | | | | | | | | [ticket/14374] Update dynamic fallback jquery CDN script tag | ||||
| | * | | [ticket/14374] Update dynamic fallback jquery CDN script tag | Matt Friedman | 2015-12-22 | 5 | -5/+5 |
| |/ / | | | | | | | | | | PHPBB3-14374 | ||||
* | | | Merge pull request #4091 from marc1706/ticket/14373 | Tristan Darricau | 2015-12-22 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14373] Do not pass arrays to strpos() * marc1706/ticket/14373: [ticket/14373] Do not pass arrays to strpos() | ||||
| * | | | [ticket/14373] Do not pass arrays to strpos() | Marc Alexander | 2015-12-20 | 1 | -1/+1 |
|/ / / | | | | | | | | | | PHPBB3-14373 | ||||
* | | | Merge pull request #4076 from Nicofuma/ticket/14177 | Marc Alexander | 2015-12-20 | 3 | -6/+130 |
|\ \ \ | | | | | | | | | | | | | [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment | ||||
| * | | | [ticket/14177] CS | Tristan Darricau | 2015-12-15 | 2 | -11/+20 |
| | | | | | | | | | | | | | | | | PHPBB3-14177 | ||||
| * | | | [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment | Tristan Darricau | 2015-12-11 | 3 | -6/+121 |
| | | | | | | | | | | | | | | | | PHPBB3-14177 |