From 507fbeb068ac168868ef00bd1f40d3ba4d17c884 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 21 Jan 2016 10:07:29 -0300
Subject: Refactoring api to use translations (chunk 1) - Add spanish
 translations - Files in order by name from admin to export - Does not include
 api templates and tests - Fix web_test to load translations - Fix i18n to
 fallback to DEFAULT_LOCALE if no system locale found

---
 config/config.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index b00dbc201..907b66828 100644
--- a/config/config.json
+++ b/config/config.json
@@ -107,5 +107,28 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
+    },
+    "GoogleSettings": {
+        "Enable": false,
+        "Secret": "",
+        "Id": "",
+        "Scope": "",
+        "AuthEndpoint": "",
+        "TokenEndpoint": "",
+        "UserApiEndpoint": ""
+    },
+    "LdapSettings": {
+        "Enable": false,
+        "LdapServer": null,
+        "LdapPort": 389,
+        "BaseDN": null,
+        "BindUsername": null,
+        "BindPassword": null,
+        "FirstNameAttribute": null,
+        "LastNameAttribute": null,
+        "EmailAttribute": null,
+        "UsernameAttribute": null,
+        "IdAttribute": null,
+        "QueryTimeout": 60
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22


From aa68caa8f043008728ddd0cb34c9bcd29fd9638a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 21 Jan 2016 12:09:56 -0300
Subject: Remove settings from config.json

---
 config/config.json | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 907b66828..076f795cc 100644
--- a/config/config.json
+++ b/config/config.json
@@ -107,28 +107,5 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
-    },
-    "GoogleSettings": {
-        "Enable": false,
-        "Secret": "",
-        "Id": "",
-        "Scope": "",
-        "AuthEndpoint": "",
-        "TokenEndpoint": "",
-        "UserApiEndpoint": ""
-    },
-    "LdapSettings": {
-        "Enable": false,
-        "LdapServer": null,
-        "LdapPort": 389,
-        "BaseDN": null,
-        "BindUsername": null,
-        "BindPassword": null,
-        "FirstNameAttribute": null,
-        "LastNameAttribute": null,
-        "EmailAttribute": null,
-        "UsernameAttribute": null,
-        "IdAttribute": null,
-        "QueryTimeout": 60
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22