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

Merge branch '3.7' into 3.8

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
This commit is contained in:
Romain Neutron
2013-09-14 02:02:56 +02:00
parent 34af09ef0b af95d781b2
commit f955163edb
8 changed files with 123 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/API/OAuth2/Application/Navigator.php
View File

@@ -9,12 +9,6 @@
* file that was distributed with this source code.
*/
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class API_OAuth2_Application_Navigator
{
const CLIENT_ID = '\alchemy\phraseanet\id\4f981093aebb66.06844599';

17
lib/classes/API/OAuth2/Application/OfficePlugin.class.php Normal file
View File

@@ -0,0 +1,17 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2012 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class API_OAuth2_Application_OfficePlugin
{
const CLIENT_ID = '\alchemy\phraseanet\id\999585175b5fbb6e140efbdfea86c561';
const CLIENT_SECRET = '\alchemy\phraseanet\secret\6d53d0bc74e6c8c1a325541f71da1ea5';
const CLIENT_NAME = 'office-plugin';
}

3
lib/classes/API/V1/adapter.php
View File

@@ -393,6 +393,9 @@ class API_V1_adapter extends API_V1_Abstract
'navigator' => array(
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
),
'office-plugin' => array(
'active' => $registry->get('GV_client_navigator'),
),
'homepage' => array(
'viewType' => $app['phraseanet.registry']->get('GV_home_publi'),
),