aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-071-1/+1
|\ \ \ | |/ /
| * | [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
| | | | | | | | | | | | PHPBB3-13588
* | | Merge pull request #3207 from Nicofuma/ticket/13407Andreas Fischer2015-02-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13407] Update Symfony to 2.7.*@dev * Nicofuma/ticket/13407: [ticket/13407] Update composer.lock file [ticket/13407] Bump minimal version to php 5.3.9 [ticket/13407] Introduce a request_stack service [ticket/13407] Remove the last occurence of pattern in routing files [ticket/13407] Update Symfony to 2.7.*@dev
| * | | [ticket/13407] Bump minimal version to php 5.3.9Nicofuma2015-02-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13407
* | | | Merge pull request #3257 from MGaetan89/ticket/13455Andreas Fischer2015-02-049-47/+53
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13455] Change request_var() calls with $request->variable() * MGaetan89/ticket/13455: [ticket/13455] Remove `request_var()` references from comments [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()` [ticket/13455] Update calls to `request_var()`
| * | | [ticket/13455] Remove `request_var()` references from commentsGaëtan Muller2015-02-033-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13455
| * | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-031-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13455
| * | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-036-44/+50
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-031-5/+6
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * develop-ascraeus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| * | Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
| | | | | | | | | | | | | | | Conflicts: phpBB/feed.php
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-033-1/+3
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| * | [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-023-1/+3
| | | | | | | | | | | | PHPBB3-13569
* | | [ticket/13139] Fix testsNicofuma2015-02-031-0/+7
| | | | | | | | | | | | PHPBB3-13139
* | | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-0212-22/+29
| | | | | | | | | | | | PHPBB3-13494
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-0/+31
|\ \ \ | |/ / | | | | | | | | | Conflicts: build/build.xml
| * | [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| | |
* | | Merge pull request #3352 from VSEphpbb/ticket/10388Marc Alexander2015-01-312-4/+5
|\ \ \ | | | | | | | | | | | | Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
| * | | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10388
| * | | [ticket/10388] Update deprecation date for addslashesMatt Friedman2015-01-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10388
| * | | [ticket/10388] Use TWIG escape JS filter instead of addslashesMatt Friedman2015-01-292-5/+5
| | | | | | | | | | | | | | | | PHPBB3-10388
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-0/+32
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| | | |
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-7/+9
|\ \ \ \ | |/ / /
| * | | [ticket/13553] Use defined title value in page headers tooMatt Friedman2015-01-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13553
| * | | [ticket/13553] Make title var accept a lang key varMatt Friedman2015-01-311-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13553
| * | | [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
| | | | | | | | | | | | | | | | PHPBB3-13553
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-312-0/+74
|\ \ \ \ | |/ / /
| * | | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
| | | | | | | | | | | | | | | | PHPBB3-13557
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-5/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [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 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 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-1/+51
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-302-1/+51
| |\ \ \ \ | | |/ / /
| | * | | [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 migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| | |/ /
* | | | 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 branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| |/ /
* | | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-279-27/+38
| | | | | | | | | | | | PHPBB3-13468
* | | 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-221-0/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13487] Add factory for db tool class
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:16:24 +0000