mirror of
https://github.com/phpbb/phpbb.git
synced 2025-09-01 20:33:16 +02:00
Merge branch 'develop' into feature/dic
* develop: (441 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ... Conflicts: phpBB/common.php phpBB/composer.json phpBB/composer.lock tests/cron/task_provider_test.php
This commit is contained in:
@@ -1,8 +1,13 @@
|
||||
{
|
||||
"minimum-stability": "beta",
|
||||
"require": {
|
||||
"symfony/config": "2.0.*",
|
||||
"symfony/dependency-injection": "2.0.*",
|
||||
"symfony/event-dispatcher": "2.1.*",
|
||||
"symfony/event-dispatcher": "2.0.*",
|
||||
"symfony/yaml": "2.0.*"
|
||||
}
|
||||
},
|
||||
"require-dev": {
|
||||
"fabpot/goutte": "1.0.x-dev"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user