Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-26 | 8 | -18/+18 |
|\ | |||||
| * | Merge pull request #3185 from Nicofuma/ticket/13389 | Marc Alexander | 2014-11-26 | 8 | -18/+18 |
| |\ | |||||
| | * | [ticket/13389] Replace pattern with path | Tristan Darricau | 2014-11-26 | 8 | -18/+18 |
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3075 from Senky/ticket/11613 | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | [ticket/11613] Allow cookies to work on netbios domains | Jakub Senko | 2014-11-22 | 1 | -1/+1 |
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-25 | 1 | -10/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus | Marc Alexander | 2014-11-25 | 1 | -10/+10 |
| |\ \ | |||||
| | * | | [ticket/13381] Fix header intendation of v312.php | Joas Schilling | 2014-11-25 | 1 | -10/+10 |
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 1 | -4/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3183 from Nicofuma/ticket/13362 | Joas Schilling | 2014-11-25 | 1 | -4/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | [ticket/13362] Ignore the whole cache directory in git | Tristan Darricau | 2014-11-25 | 1 | -4/+3 |
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 6 | -62/+189 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'prep-release-3.1.2' into develop-ascraeus | Joas Schilling | 2014-11-25 | 10 | -69/+196 |
| |\ \ \ | |||||
| | * | | | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev | Joas Schilling | 2014-11-25 | 3 | -5/+5 |
| | * | | | Merge branch 'develop-olympus' into prep-release-3.1.2 | Joas Schilling | 2014-11-25 | 1 | -23/+5 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #3180 from naderman/ticket/13376 | 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 |
| | | |/ / / | |||||
| | * | | | | [prep-release-3.1.2] Update Changelog with 13376 | Joas Schilling | 2014-11-25 | 1 | -0/+1 |
| | * | | | | [prep-release-3.1.2] Add migration to update version to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 |
| | * | | | | [prep-release-3.1.2] Increase version number to 3.1.2 | Joas Schilling | 2014-11-24 | 3 | -5/+5 |
| | * | | | | [prep-release-3.1.2] Add changelog for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+78 |
| | * | | | | [prep-release-3.1.2] Prepare Changelog | Joas Schilling | 2014-11-22 | 1 | -36/+39 |
| | * | | | | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 |
| | * | | | | [prep-release-3.1.2] Update version to 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 6 | -8/+8 |
| |/ / / / | |||||
* | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 6 | -20/+236 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #10 from phpbb/ticket/security-171 | Joas Schilling | 2014-11-22 | 6 | -20/+236 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/security-171] Remove duplicate semicolon from tests | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| | * | | | | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-22 | 2 | -2/+2 |
| | |\ \ \ \ | |||||
| | * | | | | | [ticket/security-171] Modify tests for new file_downloader class | Marc Alexander | 2014-11-21 | 2 | -12/+31 |
| | * | | | | | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-21 | 6 | -61/+153 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | [ticket/security-171] Add tests for retrieved remote data in version_helper | Marc Alexander | 2014-11-21 | 2 | -5/+189 |
| | * | | | | | | [ticket/security-171] Sanitize data from composer.json | Marc Alexander | 2014-11-21 | 3 | -11/+26 |
| | * | | | | | | [ticket/security-171] Use type cast helper for json data | Marc Alexander | 2014-11-21 | 1 | -9/+7 |
* | | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -1/+22 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #8 from phpbb/ticket/security-169 | Joas Schilling | 2014-11-22 | 2 | -1/+22 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | [ticket/security-169] Stop loop through referer dir in top directory | Marc Alexander | 2014-11-09 | 2 | -1/+22 |
* | | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 7 | -62/+154 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 7 | -62/+154 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 2 | -2/+2 |
| | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | [ticket/13358] Use protected and public keywords where applicable | Marc Alexander | 2014-11-21 | 1 | -3/+3 |
| | * | | | | | [ticket/13358] Do not pass variables by reference | Marc Alexander | 2014-11-21 | 3 | -25/+21 |
| | * | | | | | [ticket/13358] Fix tests and use exceptions instead of user object | Marc Alexander | 2014-11-21 | 5 | -22/+17 |
| | * | | | | | [ticket/13358] Use file_downloader in get_remote_file() | Marc Alexander | 2014-11-21 | 1 | -57/+8 |
| | * | | | | | [ticket/13358] Add file_downloader to version_helper | Marc Alexander | 2014-11-21 | 2 | -2/+10 |
| | * | | | | | [ticket/13358] Add file_downloader as replacement for get_remote_file | Marc Alexander | 2014-11-21 | 2 | -0/+142 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | 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 | Oliver Schramm | 2014-11-09 | 1 | -1/+11 |
| | * | | | | | [ticket/13310] Always use sql_build_query in acp_email.php | Oliver Schramm | 2014-11-09 | 1 | -6/+10 |