mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/dic

Browse Source 
* 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:
Igor Wiedler
2012-07-21 15:36:25 +02:00
parent 3ebe89cb7e 841ea0e494
commit 5d57caee58
371 changed files with 6495 additions and 2181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/composer.lock generated
View File

@@ -1,22 +1,29 @@
{
"hash": "b1e9c3bcfcee0c5630742abb3e49685f",
"hash": "e4f5efe460878599e6fed6bb13584cfd",
"packages": [
{
"package": "symfony/config",
"version": "v2.0.12"
"version": "v2.0.16"
},
{
"package": "symfony/dependency-injection",
"version": "v2.0.12"
"version": "v2.0.16"
},
{
"package": "symfony/event-dispatcher",
"version": "v2.0.12"
"version": "v2.0.16"
},
{
"package": "symfony/yaml",
"version": "v2.0.12"
"version": "v2.0.16"
}
],
"aliases": []
"packages-dev": null,
"aliases": [
],
"minimum-stability": "beta",
"stability-flags": {
"fabpot/goutte": 20
}
}