Merge branch 'soon' into staging

lib/stats.js

@@ -61,13 +61,13 @@ Stats.instanceData = function (Env) {
         data.accountRetentionTime = Env.accountRetentionTime;
 
         // does this instance have a name???
-        data.instanceName = truthyStringOrNothing(Env.instanceName);
+        data.instanceName = truthyStringOrNothing(Env.instanceName.default);
 
         // does this instance have a jurisdiction ???
-        data.instanceJurisdiction = truthyStringOrNothing(Env.instanceJurisdiction);
+        data.instanceJurisdiction = truthyStringOrNothing(Env.instanceJurisdiction.default);
 
         // does this instance have a description???
-        data.instanceDescription = truthyStringOrNothing(Env.instanceDescription);
+        data.instanceDescription = truthyStringOrNothing(Env.instanceDescription.default);
 
         // how long do you retain archived data?
         //data.archiveRetentionTime = Env.archiveRetentionTime,

www/common/translations/messages.ar.json

@@ -1 +1,12 @@
-{}
+{
+    "settings_changePasswordNew": "الكلمة السرية الجديدة",
+    "settings_changePasswordCurrent": "الكلمة السرية الحالية",
+    "settings_changePasswordButton": "تعديل الكلمة السرية",
+    "settings_changePasswordTitle": "عدّل كلمتك السرية",
+    "login_invalPass": "الكلمة السرية مطلوبة",
+    "login_password": "الكلمة السرية",
+    "login_username": "اسم المستخدم",
+    "properties_changePassword": "عدّل الكلمة السرية",
+    "properties_addPassword": "إضافة كلمة سرية",
+    "creation_passwordValue": "الكلمة السرية"
+}

www/form/inner.js

@@ -30,6 +30,8 @@ define([
     '/lib/datepicker/flatpickr.js',
     '/bower_components/sortablejs/Sortable.min.js',
 
+    'cm/addon/edit/closebrackets',
+    'cm/addon/edit/matchbrackets',
     'cm/addon/display/placeholder',
     'cm/mode/gfm/gfm',
     'css!cm/lib/codemirror.css',

www/kanban/app-kanban.less

@@ -326,7 +326,6 @@
             opacity: 0.8;
             .kanban-drag {
                 overflow: hidden;
-                padding-right: 50px;
             }
         }