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:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 19:42:22 +01:00
parent 280e8b6178 863975d7ca
commit c4eadb7e0e
52 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
composer.lock generated
View File

@@ -120,16 +120,16 @@
},
{
"name": "alchemy/geonames-api-consumer",
"version": "0.1.1",
"version": "0.1.2",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/GeonamesServer-PHP-Plugin.git",
"reference": "c01f5d2d132e215524860c336693ed043a94118f"
"reference": "111a38233da7a5503f86e96877e044381698f647"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/GeonamesServer-PHP-Plugin/zipball/c01f5d2d132e215524860c336693ed043a94118f",
"reference": "c01f5d2d132e215524860c336693ed043a94118f",
"url": "https://api.github.com/repos/alchemy-fr/GeonamesServer-PHP-Plugin/zipball/111a38233da7a5503f86e96877e044381698f647",
"reference": "111a38233da7a5503f86e96877e044381698f647",
"shasum": ""
},
"require": {
@@ -154,7 +154,7 @@
"keywords": [
"geonames"
],
"time": "2013-07-02 11:28:34"
"time": "2014-02-05 15:29:39"
},
{
"name": "alchemy/ghostscript",