aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3208 from prototech/ticket/13396Joas Schilling2014-12-061-1/+1
|\
| * [ticket/13396] Normalize multibyte characters in attachment file names.Cesar G2014-12-021-1/+1
* | Merge branch 'ticket/13400' into develop-ascraeusJoas Schilling2014-12-062-1/+2
|\ \ | |/ |/|
| * [ticket/13400] Information text if the server load id high at searchkochi2014-12-062-1/+2
|/
* Merge pull request #3204 from rxu/ticket/13405Tristan Darricau2014-11-301-1/+1
|\
| * [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
|/
* Merge pull request #3192 from Elsensee/ticket/13393Joas Schilling2014-11-291-1/+1
|\
| * [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
* | Merge pull request #3194 from Nicofuma/ticket/13381Joas Schilling2014-11-281-3/+3
|\ \
| * | [ticket/13381] Allow ' *' in the doc blocks (especially the header files)Tristan Darricau2014-11-271-3/+3
|/ /
* | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-270-0/+0
|\ \
| * \ Merge pull request #3188 from marc1706/ticket/11613Tristan Darricau2014-11-271-1/+1
| |\ \
| | * | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| |/ /
* | | Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeusCesar G2014-11-261-1/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/13391] subsilver2 poll options must have a setting of 1 when editing ...Prosk8er2014-11-261-1/+1
|/ /
* | Merge pull request #3187 from Nicofuma/ticket/13362Marc Alexander2014-11-261-2/+2
|\ \
| * | [ticket/13362] Fix cache paths in .gitignoreTristan Darricau2014-11-261-2/+2
* | | 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 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 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 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 '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 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 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 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