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

PHRAS-1248 Merge branch '4.0'

Browse Source 
Conflicts:
	Makefile
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Collection/CollectionService.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
	lib/classes/record/adapter.php
	resources/ansible/roles/app/tasks/main.yml
	resources/www/prod/js/jquery.Edit.js
	resources/www/prod/js/jquery.main-prod.js
	resources/www/prod/skins/ui-components/_answers-tools.scss
	templates/web/common/dialog_export.html.twig
	templates/web/prod/thesaurus.js.twig
This commit is contained in:
Thibaud Fabre
2016-09-28 19:52:15 +02:00
parent 1d45621b2d 675ec2c939
commit 73826d535c
43 changed files with 1046 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/configuration.sample.yml
View File

@@ -7,6 +7,7 @@ main:
languages: []
key: ''
api_require_ssl: true
api_disabled: true
database:
host: 127.0.0.1
port: 3306
@@ -191,6 +192,7 @@ api_cors:
expose_headers: []
max_age: 0
hosts: []
api_cors_paths: []
session:
idle: 0
lifetime: 604800 # 1 week