aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [ticket/13313] Update version in @since tag of eventOliver Schramm2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13313
| * | | | | | | [ticket/13313] Add event core.acp_email_displayOliver Schramm2015-01-111-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13313
* | | | | | | | Merge pull request #3334 from paul999/ticket/13542Marc Alexander2015-02-021-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $error
| * | | | | | | [ticket/13542] Added sentenence of what is changed in the eventpaulsohier2015-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13542
| * | | | | | | [ticket/13542] Merge result of validation into existing $errorpaulsohier2015-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because extensions can set a entry in $error, the result of the validate needs to be merged into it. PHPBB3-13542
| * | | | | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $errorpaulsohier2015-01-241-1/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the event so extensions will be able to validate (and deny) changes. PHPBB3-13542
* | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-012-1/+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.3Joas Schilling2015-02-011-0/+31
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-013-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-315-5/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC2Joas Schilling2015-01-311-0/+15
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-313-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'ticket/13553' into prep-release-3.1.3Joas 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 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-312-0/+74
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3355 from nickvergessen/ticket/13557Joas Schilling2015-01-312-0/+74
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
| | * | | | | | | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13557
* | | | | | | | 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
| * | | | | | | Merge pull request #3354 from nickvergessen/ticket/13556Andreas Fischer2015-01-302-5/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13556] Fix exception translation with filedownloader * nickvergessen/ticket/13556: [ticket/13556] Fix exception translation with filedownloader
| | * | | | | | | [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13556
* | | | | | | | 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-olympus' into develop-ascraeusAndreas Fischer2015-01-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: 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.13' into develop-olympusAndreas Fischer2015-01-303-29/+39
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. 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.3' into develop-ascraeusAndreas Fischer2015-01-302-44/+52
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-303-45/+53
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-294-6/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-309-47/+196
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3353 from nickvergessen/ticket/13553Dhruv Goel2015-01-301-1/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13553] Add a method to the controller helper to display a message
| | * | | | | | | | | [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-266-8/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: phpBB/adm/style/acp_update.html
| * | | | | | | | Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympusDhruv2015-01-291-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 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 branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. Conflicts: phpBB/includes/startup.php tests/security/trailing_path_test.php
| * | | | | | | | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-292-2/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-20 03:40:42 +0000