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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
parent 1497b6413a 871b19c407
commit c641ab7841
10 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
View File

@@ -32,7 +32,8 @@ class Bridge implements ControllerProviderInterface
});
$controllers
->post('/manager/', 'bridge.controller:doPostManager');
->post('/manager/', 'bridge.controller:doPostManager')
->bind('prod_bridge_manager');
$controllers
->get('/login/{api_name}/', 'bridge.controller:doGetLogin')