Merge branch 'PalisadoesFoundation:develop' into ldapAuth

.env.example

@@ -17,4 +17,7 @@ REACT_APP_USE_RECAPTCHA=
 # from here for reCAPTCHA v2 and "I'm not a robot" Checkbox, and paste the key here.
 # Note: In domains, fill localhost 
 
-REACT_APP_RECAPTCHA_SITE_KEY=
+REACT_APP_RECAPTCHA_SITE_KEY=
+
+# has to be inserted in the env file to use plugins and other websocket based features.
+REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql

public/locales/en.json

@@ -65,6 +65,7 @@
     "Block/Unblock": "Block/Unblock",
     "Plugins": "Plugins",
     "Plugin Store": "Plugin Store",
+    "Advertisement": "Advertisements",
     "allOrganizations": "All Organizations",
     "yourOrganization": "Your Organization",
     "notification": "Notification",
@@ -140,6 +141,8 @@
     "loadingUsers": "Loading Users...",
     "noUserFound": "No User Found",
     "sort": "Sort",
+    "Newest": "Newest First",
+    "Oldest": "Oldest First",
     "filter": "Filter",
     "noOrgError": "Organizations not found, please create an organization through dashboard",
     "roleUpdated": "Role Updated.",
@@ -656,6 +659,25 @@
     "event": "Event",
     "organization": "Organization"
   },
+  "advertisement": {
+    "title": "Advertisements",
+    "pHeading": "Manage Ads",
+    "activeAds": "Active Campaigns",
+    "archievedAds": "Completed Campaigns",
+    "pMessage": "Ads not present for this campaign.",
+    "delete": "Delete",
+    "Rname": "Enter name of Advertisement",
+    "Rtype": "Select type of Advertisement",
+    "Rlink": "Provide a link for content to be displayed",
+    "RstartDate": "Select Start Date",
+    "RendDate": "Select End Date",
+    "RClose": "Close the window",
+    "addNew": "Create new advertisement",
+    "EXname": "Ex. Cookie Shop",
+    "EXlink": "Ex. http://yourwebsite.com/photo",
+    "register": "Create Advertisement",
+    "close": "Close "
+  },
   "userChat": {
     "chat": "Chat",
     "search": "Search",

public/locales/fr.json

@@ -132,6 +132,8 @@
     "loadingUsers": "Chargement des utilisateurs...",
     "noUserFound": "Aucun utilisateur trouvé",
     "sort": "Trier",
+    "Oldest": "Les plus anciennes d'abord",
+    "Newest": "Les plus récentes d'abord",
     "filter": "Filtre",
     "roleUpdated": "Rôle mis à jour.",
     "noResultsFoundFor": "Aucun résultat trouvé pour ",
@@ -646,6 +648,14 @@
     "event": "Événement",
     "organization": "Organisation"
   },
+  "advertisement": {
+    "title": "Publicités",
+    "pHeading": "Gérer les publicités",
+    "activeAds": "Campagnes actives",
+    "archievedAds": "Campagnes terminées",
+    "pMessage": "Aucune publicité n'est présente pour cette campagne.",
+    "delete": "Supprimer"
+  },
   "userChat": {
     "chat": "Chat",
     "search": "Recherche",

public/locales/hi.json

@@ -131,6 +131,8 @@
     "loadingUsers": "उपयोगकर्ता लोड हो रहा है ...",
     "noUserFound": "कोई उपयोगकर्ता नहीं मिला।",
     "sort": "छांटें",
+    "Oldest": "सबसे पुराना पहले",
+    "Newest": "सबसे नवीनतम पहले",
     "filter": "फ़िल्टर",
     "roleUpdated": "भूमिका अपडेट की गई।",
     "noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
@@ -646,6 +648,14 @@
     "event": "आयोजन",
     "organization": "संगठन"
   },
+  "advertisement": {
+    "title": "विज्ञापन",
+    "pHeading": "विज्ञापन प्रबंधन",
+    "activeAds": "सक्रिय अभियान",
+    "archievedAds": "संपन्न अभियान",
+    "pMessage": "इस अभियान के लिए कोई विज्ञापन नहीं हैं।",
+    "delete": "हटाएँ"
+  },
   "userChat": {
     "chat": "बात",
     "search": "खोज",

public/locales/sp.json

@@ -131,6 +131,8 @@
     "loadingUsers": "Cargando usuarios ...",
     "noUserFound": "No se encontró ningún usuario.",
     "sort": "Ordenar",
+    "Oldest": "Más Antiguas Primero",
+    "Newest": "Más Recientes Primero",
     "filter": "Filtrar",
     "roleUpdated": "Rol actualizado.",
     "noResultsFoundFor": "No se encontraron resultados para ",
@@ -646,6 +648,14 @@
     "event": "Evento",
     "organization": "Organización"
   },
+  "advertisement": {
+    "title": "Anuncios",
+    "pHeading": "Gestionar anuncios",
+    "activeAds": "Campañas activas",
+    "archievedAds": "Campañas completadas",
+    "pMessage": "No hay anuncios disponibles para esta campaña.",
+    "delete": "Eliminar"
+  },
   "userChat": {
     "chat": "Charlar",
     "search": "Buscar",

public/locales/zh.json

@@ -131,6 +131,8 @@
     "loadingUsers": "正在加載用戶...",
     "noUserFound": "找不到用戶。",
     "sort": "排序",
+    "Oldest": "最旧的优先",
+    "Newest": "最新的优先",
     "filter": "過濾",
     "roleUpdated": "角色已更新。",
     "noResultsFoundFor": "未找到结果 ",
@@ -646,6 +648,14 @@
     "event": "事件",
     "organization": "組織"
   },
+  "advertisement": {
+    "title": "广告",
+    "pHeading": "管理广告",
+    "activeAds": "活动广告",
+    "archievedAds": "已完成的广告活动",
+    "pMessage": "此广告活动没有相关广告。",
+    "delete": "删除"
+  },
   "userChat": {
     "chat": "聊天",
     "search": "搜尋",