aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-0413-20/+20
| | | | PHPBB3-13782
* Merge branch '3.1.x'Nicofuma2015-05-033-24/+29
|\
| * Merge pull request #3588 from nickvergessen/ticket/13809-ascNicofuma2015-05-033-24/+29
| |\ | | | | | | | | | [ticket/13809] Perform the lint test prior to normal tests
| | * [ticket/13809] Test each file individuallyJoas Schilling2015-05-031-21/+28
| | | | | | | | | | | | PHPBB3-13809
| | * [ticket/13809] Perform the lint test prior to normal testsJoas Schilling2015-05-032-3/+1
| |/ | | | | | | PHPBB3-13809
* | Merge branch '3.1.x'Joas Schilling2015-05-033-2/+38
|\ \ | |/ | | | | | | Conflicts: build/build.xml
| * Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-033-2/+38
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.4] Add security issue to changelogJoas Schilling2015-05-031-0/+4
| | |
| | * [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | |
| | * [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-033-4/+4
| | |
* | | Merge branch '3.1.x'Andreas Fischer2015-05-033-1/+42
|\ \ \ | |/ / | | | | | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| * | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-030-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * \ Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-05-032-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | \ \ Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-033-1/+42
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-033-1/+42
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | | * | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.Andreas Fischer2015-05-031-0/+4
| | | | |
| | | * | [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-034-6/+12
| | | | |
* | | | | Merge pull request #3535 from MateBartus/ticket/13762Tristan Darricau2015-05-0269-686/+1679
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13762] Moving language related functionality into a service
| * | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-022-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13762
| * | | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13762
| * | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-0267-679/+1663
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13762
* | | | | Merge pull request #3565 from MateBartus/ticket/13793Tristan Darricau2015-05-0214-70/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13793] Remove translation on throwing exceptions
| * | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-0114-70/+44
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13793
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-05-021-9/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch '3.0.x' into 3.1.xTristan Darricau2015-05-021-9/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #3575 from marc1706/ticket/13792Tristan Darricau2015-05-021-9/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/13792] Use hhvm instead of manually installing nightlys for now
| | | * | | [ticket/13792] Use hhvm instead of manually installing nightlys for nowMarc Alexander2015-05-011-9/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nightly builds are currently not supported because packages for precise no longer exist and travis is still running on it. PHPBB3-13792
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-294-4/+36
| | | | |
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-282-5/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | * 3.0.x:
| | * | | Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-04-282-3/+14
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | | * | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into ↵Andreas Fischer2015-04-282-3/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.14 * phpbb-security/ticket/security-180: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * | | \ \ Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-282-5/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into ↵Andreas Fischer2015-04-282-5/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.4 * phpbb-security/ticket/security-180-asc: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | | * | | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-5/+7
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | | | * | | [ticket/security-180] Add tests for redirecting to main URLMarc Alexander2015-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-282-0/+9
| | | |\ \ \ \ | | |/ / / / / | | | | _ / / | | | | / / | | | | | | Conflicts: tests/security/redirect_test.php
| | | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-280-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [3.0.x] Increment version number to 3.0.15-dev.
| * | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-04-280-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [3.0.x] Increment version number to 3.0.15-dev. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-284-6/+6
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-284-2/+65
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-284-2/+65
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-284-2/+65
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-26 04:15:15 +0000