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' into fix-latest-merge

Browse Source 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	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
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
This commit is contained in:
Nicolas Le Goff
2014-07-11 17:19:39 +02:00
parent 24b885eb7c b4141f92a7
commit 3565d1c795
20 changed files with 300 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
composer.lock generated
View File

@@ -272,16 +272,16 @@
},
{
"name": "alchemy/phlickr",
"version": "0.2.7",
"version": "0.2.8",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Phlickr.git",
"reference": "9f228cabf924bdd5913fdb59514904d0d4c8e40a"
"reference": "26b7764fd45c15062cb1b21c9389aff919e8c2bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/9f228cabf924bdd5913fdb59514904d0d4c8e40a",
"reference": "9f228cabf924bdd5913fdb59514904d0d4c8e40a",
"url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/26b7764fd45c15062cb1b21c9389aff919e8c2bd",
"reference": "26b7764fd45c15062cb1b21c9389aff919e8c2bd",
"shasum": ""
},
"type": "library",
@@ -291,7 +291,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
"time": "2013-07-01 09:47:54"
"time": "2014-07-07 14:01:51"
},
{
"name": "alchemy/task-manager",
@@ -1569,16 +1569,16 @@
},
{
"name": "imagine/imagine",
"version": "dev-develop",
"version": "dev-flatten-layer",
"source": {
"type": "git",
"url": "https://github.com/avalanche123/Imagine.git",
"reference": "5e013323dacbb7d6ab0c0d55692e6b75d1fb30d2"
"url": "https://github.com/nlegoff/Imagine.git",
"reference": "df2d9d8834d32943082fc52b89c5b11fde279b5a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/avalanche123/Imagine/zipball/5e013323dacbb7d6ab0c0d55692e6b75d1fb30d2",
"reference": "5e013323dacbb7d6ab0c0d55692e6b75d1fb30d2",
"url": "https://api.github.com/repos/nlegoff/Imagine/zipball/df2d9d8834d32943082fc52b89c5b11fde279b5a",
"reference": "df2d9d8834d32943082fc52b89c5b11fde279b5a",
"shasum": ""
},
"require": {
@@ -1595,7 +1595,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "0.6-dev"
"dev-develop": "0.7-dev"
}
},
"autoload": {
@@ -1603,7 +1603,6 @@
"Imagine": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@@ -1622,7 +1621,10 @@
"image manipulation",
"image processing"
],
"time": "2013-12-23 10:54:18"
"support": {
"source": "https://github.com/nlegoff/Imagine/tree/flatten-layer"
},
"time": "2014-07-07 17:04:15"
},
{
"name": "ircmaxell/random-lib",
@@ -2023,12 +2025,12 @@
"source": {
"type": "git",
"url": "https://github.com/nlegoff/Media-Alchemyst.git",
"reference": "e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029"
"reference": "be5c7cd4e207c469fb88d88397bd220c4db323d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nlegoff/Media-Alchemyst/zipball/e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029",
"reference": "e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029",
"url": "https://api.github.com/repos/nlegoff/Media-Alchemyst/zipball/be5c7cd4e207c469fb88d88397bd220c4db323d8",
"reference": "be5c7cd4e207c469fb88d88397bd220c4db323d8",
"shasum": ""
},
"require": {
@@ -2090,7 +2092,7 @@
"support": {
"source": "https://github.com/nlegoff/Media-Alchemyst/tree/master"
},
"time": "2014-06-10 13:51:13"
"time": "2014-07-07 16:54:32"
},
{
"name": "mediavorus/mediavorus",
@@ -4906,6 +4908,12 @@
}
],
"aliases": [
{
"alias": "0.6.1",
"alias_normalized": "0.6.1.0",
"version": "dev-flatten-layer",
"package": "imagine/imagine"
},
{
"alias": "0.4.3",
"alias_normalized": "0.4.3.0",