| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 1 | -23/+5 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg | ||||
| | * | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev | Joas Schilling | 2014-11-25 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'develop-olympus' into prep-release-3.1.2 | Joas Schilling | 2014-11-25 | 1 | -23/+5 |
| | |\ | |||||
| | | * | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 | Nils Adermann | 2014-11-25 | 1 | -23/+5 |
| | | | | | | | | | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376 | ||||
| | | * | Merge pull request #3090 from Nicofuma/ticket/13234 | Joas Schilling | 2014-10-28 | 1 | -30/+39 |
| | | |\ | | | | | | | | | | | | | Ticket/13234 | ||||
| | | | * | [ticket/13234] Fix conditions and CS | Tristan Darricau | 2014-10-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13234 | ||||
| | | | * | [ticket/13234] Never allow autologin/remember me to modify the userid | Nils Adermann | 2014-10-27 | 1 | -31/+40 |
| | | |/ | | | | | | | | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234 | ||||
| | * | | [prep-release-3.1.2] Increase version number to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | [prep-release-3.1.2] Update version to 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -57/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 2 | -57/+10 |
| | |\ \ | | | | | | | | | | | | | [ticket/13358] Add class for retrieving remote file data | ||||
| | | * | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358 | ||||
| | | * | | [ticket/13358] Do not pass variables by reference | Marc Alexander | 2014-11-21 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | | * | | [ticket/13358] Use file_downloader in get_remote_file() | Marc Alexander | 2014-11-21 | 1 | -57/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | get_remote_file() has been marked as deprecated. PHPBB3-13358 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 1 | -7/+21 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #3123 from Elsensee/ticket/13310 | Joas Schilling | 2014-11-22 | 1 | -7/+21 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13310] Add event core.acp_email_modify_sql | ||||
| | | * | | | [ticket/13310] Add event core.acp_email_modify_sql | Oliver Schramm | 2014-11-09 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310 | ||||
| | | * | | | [ticket/13310] Always use sql_build_query in acp_email.php | Oliver Schramm | 2014-11-09 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -11/+11 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3116 from rxu/ticket/13297 | Joas Schilling | 2014-11-22 | 2 | -11/+11 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns | ||||
| | | * | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns. | rxu | 2014-11-09 | 2 | -11/+11 |
| | | |/ / / | | | | | | | | | | | | | | | | PHPBB3-13297 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3158 from prototech/ticket/13354 | Joas Schilling | 2014-11-22 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs. | ||||
| | | * | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs. | Cesar G | 2014-11-21 | 1 | -1/+1 |
| | | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-13354 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-22 | 1 | -2/+25 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | [ticket/10744] Fix some doc blocks | Joas Schilling | 2014-11-21 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744 | ||||
| | * | | | | [ticket/10744] Type hint objects for IDE usages | Joas Schilling | 2014-11-21 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744 | ||||
| | * | | | | [ticket/10744] Prevent installing styles with reserved names | Joas Schilling | 2014-11-21 | 1 | -0/+7 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-10744 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -2/+12 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html | ||||
| | * | | | Merge pull request #3044 from Elsensee/ticket/13100 | Joas Schilling | 2014-11-21 | 1 | -2/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topic | ||||
| | | * | | | [ticket/13100] Remove pointless variable | Oliver Schramm | 2014-11-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100 | ||||
| | | * | | | [ticket/13100] Display only confirmation buttons when deleting shadow topic | Oliver Schramm | 2014-10-20 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 2 | -12/+20 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #2765 from Elsensee/ticket/11863 | Joas Schilling | 2014-11-21 | 2 | -12/+20 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/11863] Set require_activation to none if emails are disabled | ||||
| | | * | | | | [ticket/11863] Display warning to user because of activation method | Oliver Schramm | 2014-10-17 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11863 | ||||
| | | * | | | | [ticket/11863] Grey out unavailable activation methods when emails disabled | Oliver Schramm | 2014-10-17 | 2 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further fall back to USER_ACTIVATION_DISABLE when emails are disabled but evaluate it at runtime. PHPBB3-11863 | ||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -0/+16 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3131 from omniError/ticket/13328 | Joas Schilling | 2014-11-21 | 1 | -0/+16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sql | ||||
| | | * | | | | | [ticket/13328] fix CS | omniError | 2014-11-11 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328 | ||||
| | | * | | | | | [ticket/13328] add core.mcp_view_forum_modify_sql | omniError | 2014-11-10 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328 | ||||
| * | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+44 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #3114 from rxu/ticket/13294 | Joas Schilling | 2014-11-21 | 1 | -1/+44 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13294] Add function parse() core event for additional message checks | ||||
| | | * | | | | | | [ticket/13294] Add function parse() core event for additional message checks | rxu | 2014-11-20 | 1 | -1/+44 |
| | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function parse() in includes/message_parser.php to allow additional handling message before parsing (i.e. perform custom message checks, cleanup etc.). PHPBB3-13294 | ||||
| * | | | | | | | [ticket/12620] Remove the old includes/functions_url_matcher.php file | Tristan Darricau | 2014-11-21 | 1 | -102/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Use the right environment while installing | Tristan Darricau | 2014-11-20 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Fix tests | Tristan Darricau | 2014-11-20 | 2 | -11/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Fix coding style | Tristan Darricau | 2014-11-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Use the container to get the environment name | Tristan Darricau | 2014-11-20 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Uses a cache directory per environment | Tristan Darricau | 2014-11-20 | 1 | -25/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
| * | | | | | | | [ticket/12620] Fix download/file.php and app.php outside of the root_path | Tristan Darricau | 2014-11-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620 | ||||
