hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Root.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Export.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/format.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Feed_CollectionTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
This commit is contained in:
Nicolas Le Goff
2014-03-30 09:00:17 +02:00
parent e317f86c51 aa07eba97f
commit e97ed2b3f1
15 changed files with 482 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "88bbe728663cb23ecfba31d240af17c3",
"hash": "2b68364c4ebb09b6f5c3902e0afdcc1a",
"packages": [
{
"name": "alchemy-fr/tcpdf-clone",
@@ -1369,6 +1369,64 @@
"tree",
"uploadable"
],
"time": "2013-08-18 07:18:44"
},
{
"name": "goodby/csv",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/goodby/csv.git",
"reference": "da672802985d196cae767da29b11618a676496b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/goodby/csv/zipball/da672802985d196cae767da29b11618a676496b0",
"reference": "da672802985d196cae767da29b11618a676496b0",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3.2"
},
"require-dev": {
"mikey179/vfsstream": ">=1.1.0",
"mockery/mockery": ">=0.7.2",
"phpunit/phpunit": "3.7.*",
"suin/php-expose": ">=1.0"
},
"type": "library",
"autoload": {
"psr-0": {
"Goodby\\CSV": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "suin",
"email": "suinyeze@gmail.com",
"homepage": "https://www.facebook.com/suinyeze",
"role": "Developer, Renaming Specialist"
},
{
"name": "reoring",
"email": "mori.reo@gmail.com",
"homepage": "https://www.facebook.com/reoring",
"role": "Developer"
}
],
"description": "CSV import/export library",
"homepage": "https://github.com/goodby/csv",
"keywords": [
"csv",
"export",
"import"
],
"time": "2013-11-22 19:10:34"
"time": "2014-01-12 16:34:06"
},
{