aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-268-18/+18
|\
| * Merge pull request #3185 from Nicofuma/ticket/13389Marc Alexander2014-11-268-18/+18
| |\
| | * [ticket/13389] Replace pattern with pathTristan Darricau2014-11-268-18/+18
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3075 from Senky/ticket/11613Marc Alexander2014-11-261-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-251-10/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeusMarc Alexander2014-11-251-10/+10
| |\ \
| | * | [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-251-4/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #3183 from Nicofuma/ticket/13362Joas Schilling2014-11-251-4/+3
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/13362] Ignore the whole cache directory in gitTristan Darricau2014-11-251-4/+3
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-256-62/+189
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.2' into develop-ascraeusJoas Schilling2014-11-2510-69/+196
| |\ \ \
| | * | | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-253-5/+5
| | * | | Merge branch 'develop-olympus' into prep-release-3.1.2Joas Schilling2014-11-251-23/+5
| | |\ \ \
| | | * \ \ Merge pull request #3180 from naderman/ticket/13376Joas Schilling2014-11-251-23/+5
| | | |\ \ \
| | | | * | | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3Nils Adermann2014-11-251-23/+5
| | | |/ / /
| | * | | | [prep-release-3.1.2] Update Changelog with 13376Joas Schilling2014-11-251-0/+1
| | * | | | [prep-release-3.1.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| | * | | | [prep-release-3.1.2] Increase version number to 3.1.2Joas Schilling2014-11-243-5/+5
| | * | | | [prep-release-3.1.2] Add changelog for 3.1.2-RC1Joas Schilling2014-11-221-0/+78
| | * | | | [prep-release-3.1.2] Prepare ChangelogJoas Schilling2014-11-221-36/+39
| | * | | | [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
| | * | | | [prep-release-3.1.2] Update version to 3.1.2-RC1Joas Schilling2014-11-226-8/+8
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-226-20/+236
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #10 from phpbb/ticket/security-171Joas Schilling2014-11-226-20/+236
| |\ \ \ \
| | * | | | [ticket/security-171] Remove duplicate semicolon from testsMarc Alexander2014-11-221-1/+1
| | * | | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-222-2/+2
| | |\ \ \ \
| | * | | | | [ticket/security-171] Modify tests for new file_downloader classMarc Alexander2014-11-212-12/+31
| | * | | | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-216-61/+153
| | |\ \ \ \ \
| | * | | | | | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-212-5/+189
| | * | | | | | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-213-11/+26
| | * | | | | | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-1/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #8 from phpbb/ticket/security-169Joas Schilling2014-11-222-1/+22
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | [ticket/security-169] Stop loop through referer dir in top directoryMarc Alexander2014-11-092-1/+22
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-227-62/+154
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-227-62/+154
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-222-2/+2
| | | |_|/ / / | | |/| | | |
| | * | | | | [ticket/13358] Use protected and public keywords where applicableMarc Alexander2014-11-211-3/+3
| | * | | | | [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-213-25/+21
| | * | | | | [ticket/13358] Fix tests and use exceptions instead of user objectMarc Alexander2014-11-215-22/+17
| | * | | | | [ticket/13358] Use file_downloader in get_remote_file()Marc Alexander2014-11-211-57/+8
| | * | | | | [ticket/13358] Add file_downloader to version_helperMarc Alexander2014-11-212-2/+10
| | * | | | | [ticket/13358] Add file_downloader as replacement for get_remote_fileMarc Alexander2014-11-212-0/+142
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-7/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3123 from Elsensee/ticket/13310Joas Schilling2014-11-221-7/+21
| |\ \ \ \ \
| | * | | | | [ticket/13310] Add event core.acp_email_modify_sqlOliver Schramm2014-11-091-1/+11
| | * | | | | [ticket/13310] Always use sql_build_query in acp_email.phpOliver Schramm2014-11-091-6/+10