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.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
This commit is contained in:
Nicolas Le Goff
2014-12-09 13:59:29 +01:00
parent 7d0a69c7b9 3aa8107fb0
commit 9f38823f27
55 changed files with 1106 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
composer.lock generated
View File

@@ -1574,12 +1574,12 @@
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Imagine.git",
"reference": "e75d9495677b40e0868836e3510667178b2bd90a"
"reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/e75d9495677b40e0868836e3510667178b2bd90a",
"reference": "e75d9495677b40e0868836e3510667178b2bd90a",
"url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/372f36e2d76e4ca1fbdccda57c23b8483ed700b1",
"reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1",
"shasum": ""
},
"require": {
@@ -1596,7 +1596,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "0.7-dev"
"dev-develop": "0.6-dev"
}
},
"autoload": {
@@ -1623,9 +1623,9 @@
"image processing"
],
"support": {
"source": "https://github.com/nlegoff/Imagine/tree/flatten-layer"
"source": "https://github.com/alchemy-fr/Imagine/tree/0.6.1-flatten-layer"
},
"time": "2014-10-08 16:23:33"
"time": "2014-11-19 14:31:17"
},
{
"name": "ircmaxell/random-lib",
@@ -2020,16 +2020,16 @@
},
{
"name": "media-alchemyst/media-alchemyst",
"version": "0.4.6",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8"
"reference": "62fec183416ce6dfdf22e832f0de3c7442a23598"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0145a40c01b67268a29ee3863e1ce7be4ad60ac8",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/62fec183416ce6dfdf22e832f0de3c7442a23598",
"reference": "62fec183416ce6dfdf22e832f0de3c7442a23598",
"shasum": ""
},
"require": {
@@ -2089,7 +2089,7 @@
"video",
"video processing"
],
"time": "2014-09-10 09:44:33"
"time": "2014-10-20 07:22:23"
},
{
"name": "mediavorus/mediavorus",
@@ -4967,6 +4967,7 @@
"alchemy/zippy": 20,
"imagine/imagine": 20,
"neutron/process-manager": 20,
"media-alchemyst/media-alchemyst": 20,
"phpexiftool/phpexiftool": 20,
"silex/silex": 20,
"silex/web-profiler": 20,