Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-10 | 1 | -0/+12 |
|\ | |||||
| * | Merge pull request #4513 from senky/ticket/14760 | Marc Alexander | 2016-12-10 | 1 | -0/+12 |
| |\ | | | | | | | | | | [ticket/14760] Add core.mcp_main_modify_fork_sql event | ||||
| | * | [ticket/14760] Add core.mcp_main_modify_fork_sql event | Jakub Senko | 2016-11-13 | 1 | -0/+12 |
| | | | | | | | | | | | | PHPBB3-14760 | ||||
* | | | [3.2.x] Update version numbers to 3.2.0-RC3-dev | Marc Alexander | 2016-12-10 | 5 | -7/+7 |
| | | | |||||
* | | | Merge branch 'prep-release-3.2.0-RC2' into 3.2.x | Marc Alexander | 2016-12-10 | 8 | -9/+130 |
|\ \ \ | |||||
| * | | | [prep-release-3.2.0-RC2] Update changelog | Marc Alexander | 2016-12-09 | 1 | -0/+4 |
| | | | | |||||
| * | | | [prep-release-3.2.0-RC2] Update changelog | Marc Alexander | 2016-12-09 | 1 | -0/+77 |
| | | | | |||||
| * | | | [prep-release-3.2.0-RC2] Add migration file for 3.2.0-RC2 | Marc Alexander | 2016-12-09 | 1 | -0/+40 |
| | | | | |||||
| * | | | [prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 | Marc Alexander | 2016-12-09 | 2 | -3/+3 |
| | | | | |||||
| * | | | [prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 | Marc Alexander | 2016-12-09 | 4 | -6/+6 |
|/ / / | |||||
* | | | Merge pull request #4571 from marc1706/ticket/14894 | Marc Alexander | 2016-12-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | [ticket/14894] Use correct config name for conflicts archive extension | ||||
| * | | | [ticket/14894] Use correct config name for conflicts archive extension | Marc Alexander | 2016-12-09 | 1 | -1/+1 |
|/ / / | | | | | | | | | | PHPBB3-14894 | ||||
* | | | Merge pull request #4569 from marc1706/ticket/14891 | Máté Bartus | 2016-12-09 | 4 | -10/+86 |
|\ \ \ | | | | | | | | | | | | | [ticket/14891] Use own proxy instantiator for open_basedir compatibility | ||||
| * | | | [ticket/14891] Don't rely on sys_get_temp_dir() being available | Marc Alexander | 2016-12-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or actually returning a path. It might also return an empty string or null. PHPBB3-14891 | ||||
| * | | | [ticket/14891] Use filesystem classes for checking on tmp dir | Marc Alexander | 2016-12-09 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache dir will now also only be used if tmp dir does not exist or if it's not writable. PHPBB3-14891 | ||||
| * | | | [ticket/14891] Remove unused use statements | Marc Alexander | 2016-12-09 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-14891 | ||||
| * | | | [ticket/14891] Use own proxy instantiator for open_basedir compatibility | Marc Alexander | 2016-12-09 | 4 | -9/+83 |
|/ / / | | | | | | | | | | | | | | | | Also reverted random_compat lib to 1.4.x. PHPBB3-14891 | ||||
* | | | Merge pull request #4568 from marc1706/ticket/14900 | Marc Alexander | 2016-12-08 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | | | | | [ticket/14900] Do not state missing cached version check means ext is invalid | ||||
| * | | | [ticket/14900] Do not state missing cached version check means ext is invalid | Marc Alexander | 2016-12-08 | 1 | -1/+5 |
|/ / / | | | | | | | | | | | | | | | | Also fixed typo in code that was looming there for a while. PHPBB3-14900 | ||||
* | | | Merge pull request #4565 from marc1706/ticket/14896 | Máté Bartus | 2016-12-08 | 1 | -5/+11 |
|\ \ \ | | | | | | | | | | | | | [ticket/14896] Do not overwrite login when finishing install | ||||
| * | | | [ticket/14896] Do not overwrite login when finishing install | Marc Alexander | 2016-12-07 | 1 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the user will be "logged in" again as guest user which will prevent any redirectiong to the ACP after the installation. PHPBB3-14896 | ||||
* | | | | Merge pull request #4566 from CHItA/ticket/14897 | Marc Alexander | 2016-12-08 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | [ticket/14897] Add $restart_progress_bar to iohandler base | ||||
| * | | | [ticket/14897] Add $restart_progress_bar to iohandler base | Máté Bartus | 2016-12-07 | 1 | -0/+5 |
|/ / / | | | | | | | | | | PHPBB3-14897 | ||||
* | | | Merge branch 'ticket/14892' into 3.2.x | Marc Alexander | 2016-12-06 | 2 | -87/+87 |
|\ \ \ | |||||
| * | | | [ticket/14892] Revert to twig 1.24 to have working assets again | Marc Alexander | 2016-12-06 | 2 | -87/+87 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Twig 1.25 and after introduced a way of handling both relative and absolute paths. However, it seems to handle absolute windows paths as relative paths. This breaks any assets or similar ways of including files into the main template files. PHPBB3-14892 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-05 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4559 from javiexin/ticket/14890 | Marc Alexander | 2016-12-05 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | [ticket/14890] Typo in input validation of profile fields of type string | ||||
| | * | | [ticket/14890] Typo in input validation of profile fields of type string | javiexin | 2016-12-05 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | This bug was introduced by PHPBB3-14272 PHPBB3-14890 | ||||
* | | | Merge pull request #3856 from Nicofuma/ticket/12610 | Marc Alexander | 2016-12-05 | 22 | -136/+633 |
|\ \ \ | | | | | | | | | | | | | [ticket/12610] Add command to check if the board is up to date. | ||||
| * | | | [ticket/12610] Fix tests and use getOption() for console | Marc Alexander | 2016-12-05 | 2 | -25/+32 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Use Symfony style guide | Tristan Darricau | 2016-12-04 | 2 | -87/+87 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Add a better error message when an extension is missing | Tristan Darricau | 2016-12-04 | 2 | -44/+64 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Correctly handle empty cache | Tristan Darricau | 2016-12-03 | 5 | -15/+47 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Ignor exception due to the version check in extensions list | Tristan Darricau | 2016-12-03 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Display the latest version and not the branch name in CLI | Tristan Darricau | 2016-12-03 | 2 | -11/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] CS | Tristan Darricau | 2016-12-03 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Improve output | Tristan Darricau | 2016-12-03 | 3 | -18/+33 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Skip extensions with no update info | Tristan Darricau | 2016-12-03 | 1 | -15/+36 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Use exception_interface | Tristan Darricau | 2016-12-03 | 9 | -68/+46 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Fix tests | Tristan Darricau | 2016-12-03 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
| * | | | [ticket/12610] Add command to check if the board is up to date. | Etienne Baroux | 2016-12-03 | 14 | -72/+491 |
| | | | | | | | | | | | | | | | | PHPBB3-12610 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-12-04 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | * 3.1.x: [ticket/14888] Missing check for disabled profile field types | ||||
| * | | Merge pull request #4555 from javiexin/ticket/14888 | Tristan Darricau | 2016-12-04 | 1 | -0/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14888] Missing check for disabled profile field types * javiexin/ticket/14888: [ticket/14888] Missing check for disabled profile field types | ||||
| | * | | [ticket/14888] Missing check for disabled profile field types | javiexin | 2016-12-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Checks if a profile field type is enabled before using it. PHPBB3-14888 | ||||
| | * | | Merge branch '3.1.x' of https://github.com/javiexin/phpbb into 3.1.x | javiexin | 2016-10-26 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | Merge pull request #1 from phpbb/3.1.x | javiexin | 2015-07-09 | 204 | -1038/+4200 |
| | | |\ \ | | | | | | | | | | | | | Bring version up to date 20150708 | ||||
* | | | \ \ | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-03 | 1 | -0/+22 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #4524 from senky/ticket/13479 | Marc Alexander | 2016-12-03 | 1 | -0/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13479] Add core.viewtopic_highlight_modify | ||||
| | * | | | | | [ticket/13479] Add core.viewtopic_highlight_modify | Jakub Senko | 2016-11-20 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13479 | ||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-03 | 1 | -3/+23 |
|\ \ \ \ \ \ \ | |/ / / / / / |