aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-301-1/+1
|\ | | | | | | | | * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| * 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.php * rxu/ticket/13405: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| | * [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| |/ | | | | | | PHPBB3-13405
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-291-1/+1
|\ \ | |/
| * Merge pull request #3192 from Elsensee/ticket/13393Joas Schilling2014-11-291-1/+1
| |\ | | | | | | | | | [ticket/13393] Call user->lang function directly
| | * [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
| | | | | | | | | | | | PHPBB3-13393
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-281-3/+3
|\ \ \ | |/ /
| * | Merge pull request #3194 from Nicofuma/ticket/13381Joas Schilling2014-11-281-3/+3
| |\ \ | | | | | | | | | | | | [ticket/13381] Allow ' *' in the doc blocks (especially the header files)
| | * | [ticket/13381] Allow ' *' in the doc blocks (especially the header files)Tristan Darricau2014-11-271-3/+3
| |/ / | | | | | | | | | PHPBB3-13381
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-270-0/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/11613] Allow cookies to work on netbios domains
| * | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-270-0/+0
| |\ \ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11613] Allow cookies to work on netbios domains
| | * \ Merge pull request #3188 from marc1706/ticket/11613Tristan Darricau2014-11-271-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11613] Allow cookies for domains without dots * marc1706/ticket/11613: [ticket/11613] Allow cookies to work on netbios domains
| | | * | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-11613
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-11-260-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post Conflicts: phpBB/styles/subsilver2/template/posting_poll_body.html
| * | | Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeusCesar G2014-11-261-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * Prosk8er/ticket/13391: [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
| | * | [ticket/13391] subsilver2 poll options must have a setting of 1 when editing ↵Prosk8er2014-11-261-1/+1
| |/ / | | | | | | | | | | | | | | | a post PHPBB3-13391
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-2/+2
|\ \ \ | |/ /
| * | Merge pull request #3187 from Nicofuma/ticket/13362Marc Alexander2014-11-261-2/+2
| |\ \ | | | | | | | | | | | | [ticket/13362] Fix cache paths in .gitignore
| | * | [ticket/13362] Fix cache paths in .gitignoreTristan Darricau2014-11-261-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13362
* | | | 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 path
| | * | | [ticket/13389] Replace pattern with pathTristan Darricau2014-11-268-18/+18
| | |/ / | | | | | | | | | | | | PHPBB3-13389
* | | | 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] Cookies do not work for netbios domain
| | * | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11613
* | | | 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
| | | | | | | | | | | | | | | | | | | | PHPBB3-13381
* | | | | 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 git
| | * | | [ticket/13362] Ignore the whole cache directory in gitTristan Darricau2014-11-251-4/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13362
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-256-62/+189
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | 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 92f554e3
| | | | * | | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3Nils Adermann2014-11-251-23/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376
| | * | | | [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] Use type cast helper for json data
| | * | | | [ticket/security-171] Remove duplicate semicolon from testsMarc Alexander2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-216-61/+153
| | |\ \ \ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 19:45:47 +0000