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

Merge pull request #476 from romainneutron/fix_07-10

Browse Source 
[3.8] Multiple fixes
This commit is contained in:
Romain Neutron
2013-07-10 09:19:48 -07:00
parent 9c628da95d 2d8e53bef2
commit 9c531b9466
21 changed files with 161 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/configuration.sample.yml
View File

@@ -80,11 +80,10 @@ border-manager:
mediatypes: [Audio, Document, Flash, Image, Video]
authentication:
auto-create:
enabled: false
templates: { }
captcha:
enabled: true
trials-before-failure: 9
trials-before-display: 9
providers:
facebook:
enabled: false