# HG changeset patch
# User hamidouk
# Date 1328698009 -3600
# Node ID ee852fed0ea52d17d27f35b86ae11f273c782295
# Parent  364036384cb633fa6a197d4b4421fd1473bc3b6a# Parent  005a74eaf91a7fca925b0d51737f6819ea86596b
Merge with upstream

diff -r 364036384cb6 -r ee852fed0ea5 .DS_Store
Binary file .DS_Store has changed
diff -r 364036384cb6 -r ee852fed0ea5 web/ldtplatform/config.py.tmpl
--- a/web/ldtplatform/config.py.tmpl	Wed Feb 08 11:46:17 2012 +0100
+++ b/web/ldtplatform/config.py.tmpl	Wed Feb 08 11:46:49 2012 +0100
@@ -94,10 +94,4 @@
 
 FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"]
 
-SYNTAX = {
-          '++' : 'OK',
-          '--' : 'KO',
-          '==' : 'REF',
-          '??' : 'Q'
-          }
 
diff -r 364036384cb6 -r ee852fed0ea5 web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py	Wed Feb 08 11:46:17 2012 +0100
+++ b/web/ldtplatform/settings.py	Wed Feb 08 11:46:49 2012 +0100
@@ -178,7 +178,9 @@
 ACCOUNT_ACTIVATION_DAYS = 7 
 
 LDT_MAX_SEARCH_NUMBER = 50
-LDT_JSON_DEFAULT_INDENT = 2
+LDT_JSON_DEFAULT_INDENT = 0
+LDT_MAX_FRAGMENT_PER_SEARCH = 3
+LDT_RESULTS_PER_PAGE = 10
 
 OAUTH_PROVIDER_KEY_SIZE = 32
 OAUTH_PROVIDER_SECRET_SIZE = 32
@@ -229,6 +231,13 @@
 PUBLIC_GROUP_NAME = 'everyone'
 MAX_USERS_SEARCH = 20
 
+SYNTAX = {
+          '++' : 'OK',
+          '--' : 'KO',
+          '==' : 'REF',
+          '??' : 'Q'
+          }
+
 
 from config import *