aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-5/+6
|\ | | | | | | | | * develop-ascraeus: [ticket/13556] Fix exception translation with filedownloader
| * Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-302-5/+6
| |\ | | | | | | | | | | | | * prep-release-3.1.3: [ticket/13556] Fix exception translation with filedownloader
| | * [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
| | | | | | | | | | | | PHPBB3-13556
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-301-1/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-301-1/+2
| |\ \ | | |/
| | * Merge pull request #3341 from brunoais/ticket/13544Joas Schilling2015-01-301-1/+2
| | |\ | | | | | | | | | | | | [ticket/13544] Fixing wrong SQL query for permission_unset() for roles
| | | * [ticket/13544] Use integer case because $role_id is an intbrunoais2015-01-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13544
| | | * [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
| | | | | | | | | | | | | | | | PHPBB3-13544
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-43/+51
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. Conflicts: build/build.xml
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-301-43/+51
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.3: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
| | * | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-302-44/+52
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. [ticket/12933] Handle case when * is last character of word [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: build/build.xml phpBB/adm/style/acp_update.html phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/includes/startup.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql tests/security/trailing_path_test.php
| | | * | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.Andreas Fischer2015-01-301-2/+2
| | | | |
| | | * | [prep-release-3.0.13] Also update version in references to files.Andreas Fischer2015-01-291-3/+3
| | | | |
| | | * | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.Andreas Fischer2015-01-291-0/+10
| | | | |
| | | * | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.Andreas Fischer2015-01-291-24/+24
| | | | |
| | | * | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.Andreas Fischer2015-01-293-4/+10
| | | | |
| | | * | Merge pull request #3347 from bantu/ticket/13554Dhruv Goel2015-01-291-1/+1
| | | |\ \ | | | | | | | | | | | | [ticket/13554] Show feature release upgrades in blue rather than red.
| | | | * | [ticket/13554] Show feature release upgrades in blue rather than red.Andreas Fischer2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13554
| | | * | | Merge pull request #3348 from bantu/ticket/13549Andreas Fischer2015-01-291-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | | * | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-281-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549
| | | * | | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-12933
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-304-40/+189
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13553] Add a method to the controller helper to display a message [prep-release-3.1.3] Add changelog for 3.1.3-RC1 [prep-release-3.1.3] Prepare Changelog [prep-release-3.1.3] Add migration for 3.1.3-RC1 [prep-release-3.1.3] Update version to 3.1.2-RC1 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.3' into develop-ascraeusDhruv2015-01-308-46/+195
| |\ \ \ \ | | |/ / /
| | * | | [ticket/13553] Add a method to the controller helper to display a messageJoas Schilling2015-01-291-1/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-13553
| | * | | [prep-release-3.1.3] Add changelog for 3.1.3-RC1Joas Schilling2015-01-261-0/+96
| | | | |
| | * | | [prep-release-3.1.3] Prepare ChangelogJoas Schilling2015-01-261-38/+41
| | | | |
| | * | | [prep-release-3.1.3] Add migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| | | | |
| | * | | [prep-release-3.1.3] Update version to 3.1.2-RC1Joas Schilling2015-01-265-7/+7
| | | |/ | | |/|
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-291-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
| * | | Merge pull request #3338 from dhruvgoel92/ticket/12933Andreas Fischer2015-01-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12933] Handle *wildcard character in native search * dhruvgoel92/ticket/12933: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
| | * \ \ Merge branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12933
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-281-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13414] Set Content-Length header only if status is not 304
| * | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-281-5/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13414] Set Content-Length header only if status is not 304 Conflicts: phpBB/download/file.php
| | * | | [ticket/13414] Set Content-Length header only if status is not 304Marc Alexander2015-01-281-5/+7
| | |/ / | | | | | | | | | | | | PHPBB3-13414
* | | | Merge pull request #3263 from MGaetan89/ticket/13468Tristan Darricau2015-01-2856-327/+566
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13468] Change add_log() calls with $phpbb_log->add() * MGaetan89/ticket/13468: [ticket/13468] Update calls to `add_log()`
| * | | | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-2756-327/+566
| | | | | | | | | | | | | | | | | | | | PHPBB3-13468
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-261-2/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | * develop-ascraeus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes
| * | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-261-2/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/install/database_update.php
| | * | Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-262-2/+11
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-263-3/+9
| | | |
| | | * [prep-release-3.0.13] Highlight security relevant changesNils Adermann2015-01-261-2/+5
| | | |
* | | | Merge pull request #3179 from Nicofuma/ticket/13372Marc Alexander2015-01-241-28/+17
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13372] Fix Url Generator/Matcher generation
| * | | | [ticket/13372] Fix require_once CSTristan Darricau2014-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13372
| * | | | [ticket/13372] Fix Url Generator/Matcher generationTristan Darricau2014-11-251-28/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13372
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-231-1/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-231-1/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13282] Use 0 as default for integer type columns in postgresql
| | * | | | [ticket/13282] Use strpos() instead of preg_match()Marc Alexander2015-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13282
| | * | | | [ticket/13282] Use 0 as default for integer type columns in postgresqlMarc Alexander2015-01-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13282
* | | | | | Merge pull request #3275 from nickvergessen/ticket/13487Marc Alexander2015-01-222-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13487] Add factory for db tool class
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 10:39:25 +0000