aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-67/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
| * | | | | [ticket/13106] Remove \phpbb\di\pass\kernel_pass.phpJakub Senko2014-09-251-67/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13106
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-242-2/+97
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-242-2/+97
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13055] Fix string profile fields validation to support unicode
| | * | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-182-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13055
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13048] Only do not update the session page for ajax requests
| * | | | | Merge pull request #2985 from nickvergessen/ticket/13048Andreas Fischer2014-09-231-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13048] Only do not update the session page for ajax requests * nickvergessen/ticket/13048: [ticket/13048] Only do not update the session page for ajax requests
| | * | | | | [ticket/13048] Only do not update the session page for ajax requestsJoas Schilling2014-09-231-3/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The session time still needs to be updated, so e.g. long upload times with PLupload stop the session from timing out. PHPBB3-13048
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13070] Use old 'template' class for template class hook
| * | | | | [ticket/13070] Use old 'template' class for template class hookMarc Alexander2014-09-221-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13070
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-211-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By n-aleha # Via Dhruv Goel (1) and n-aleha (1) * develop-ascraeus: [ticket/13085] Fix typo in oauth.php
| * | | | [ticket/13085] Fix typo in oauth.phpn-aleha2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13085
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-0/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4Joas Schilling2014-09-191-0/+32
| | | | |
* | | | | Merge branch 'ticket/13073' into ticket/13073-developMarc Alexander2014-09-191-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: tests/controller/common_helper_route.php
| * | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now calling get_preg_expression() instead of hardcoding the regex into the helper route method. PHPBB3-13073
| * | | | [ticket/13073] Use just one regex in helper route()Marc Alexander2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | [ticket/13073] Properly place comments in helperMarc Alexander2014-09-191-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13073
| * | | | [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routesMarc Alexander2014-09-181-2/+10
| | |_|/ | |/| | | | | | | | | | PHPBB3-13073
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-182-18/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12963] Always use core_path and core_directory() [ticket/12963] Remove old migration/ folder from tests [ticket/12963] Revert back to "migrations" folder name for extensions
| * | | [ticket/12963] Revert back to "migrations" folder name for extensionsJoas Schilling2014-09-182-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | The issues that can be created with the name change are just too much PHPBB3-12963
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-18/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
| * | | [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."Joas Schilling2014-09-171-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122. PHPBB3-13064
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-172-40/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
| * | | Merge pull request #2948 from Nicofuma/ticket/13061Joas Schilling2014-09-172-40/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13061] Replace the service event.subscriber_loader by a compiler pass * Nicofuma/ticket/13061: [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
| | * | | [ticket/13061] Replace the service event.subscriber_loader by a compiler passTristan Darricau2014-09-132-40/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13061
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-1/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13064] Validate the migrations provided to migrator::set_migrations()
| * | | | Merge pull request #2951 from Nicofuma/ticket/13064Joas Schilling2014-09-171-1/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13064] Validate the migrations provided to migrator::set_migrations() * Nicofuma/ticket/13064: [ticket/13064] Validate the migrations provided to migrator::set_migrations()
| | * | | | [ticket/13064] Validate the migrations provided to migrator::set_migrations()Tristan Darricau2014-09-141-1/+18
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13064
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-171-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2922 from Nicofuma/ticket/13036Marc Alexander2014-09-171-3/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13036] Make the reference type configurable when generating a route
| | * | | | [ticket/13036] Add unit testsTristan Darricau2014-09-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13036
| | * | | | [ticket/13036] Make the reference type configurable when generating a routeTristan Darricau2014-09-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13036
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-172-5/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2932 from Nicofuma/ticket/12963Marc Alexander2014-09-172-5/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/12963] Load extensions migrations from /migration
| | * | | | [ticket/12963] Edit deprecation messageTristan Darricau2014-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12963
| | * | | | [ticket/12963] Load extensions migrations from /migrationTristan Darricau2014-09-102-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12963
| | * | | | [ticket/12963] Don't use static var in \extension\base\get_migration_file_listTristan Darricau2014-09-101-4/+5
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static var was global to all instance of \phpbb\base and so if two different instances (for two different extensions) were created by the same script they shared the same migrations list. PHPBB3-12963
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-161-15/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2921 from Nicofuma/ticket/13034Marc Alexander2014-09-161-15/+29
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/13034] Fix the route generated for the frontend not in the phpbb root path
| | * | | [ticket/13034] Update the base url to move to the root dirTristan Darricau2014-09-151-2/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-13034
| | * | | [ticket/13034] Add commentTristan Darricau2014-09-151-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13034
| | * | | [ticket/13034] Use utf8_basenameTristan Darricau2014-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13034
| | * | | [ticket/13034] Fix the route generated for the frontend not in the phpbb rootTristan Darricau2014-09-041-14/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13034
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-7/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12734] Remove unnecessary error supressing
| * | | | [ticket/12734] Remove unnecessary error supressingJakub Senko2014-09-101-7/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12734
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13048] Only update session_page if request is not ajax
| * | | | [ticket/13048] Only update session_page if request is not ajaxJakub Senko2014-09-071-2/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-13048
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-3/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12852] Add unit tests [ticket/12852] Add space after if [ticket/12852] Remove whitespace [ticket/12852] Make get_url_parts handle get variable with no value
| * | | Merge pull request #2919 from Senky/ticket/12852Tristan Darricau2014-09-061-3/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12852] Make get_url_parts handle get variable with no value * Senky/ticket/12852: [ticket/12852] Add unit tests [ticket/12852] Add space after if [ticket/12852] Remove whitespace [ticket/12852] Make get_url_parts handle get variable with no value
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 11:01:54 +0000