Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

application/Espo/Core/defaults/config.php

@@ -83,6 +83,14 @@ return array (
 	  'EUR' => 1.37,
 	),
   ),
+  'globalSearchEntityList' => 
+  array (
+    0 => 'Account',
+    1 => 'Contact',
+    2 => 'Lead',
+    3 => 'Prospect',
+    4 => 'Opportunity',
+  ),
   'crud' => array(
 	'get' => 'read',
 	'post' => 'create',

application/Espo/Modules/Crm/Resources/i18n/en_US/Global.json

@@ -40,7 +40,14 @@
 		"Create InboundEmail": "Create Inbound Email",
 		"Activities": "Activities",
 		"History": "History",
-		"Attendees": "Attendees"
+		"Attendees": "Attendees",
+		"Schedule Meeting": "Schedule Meeting",
+		"Schedule Call": "Schedule Call",
+		"Compose Email": "Compose Email",
+		"Log Meeting": "Log Meeting",
+		"Log Call": "Log Call",
+		"Archive Email": "Archive Email",
+		"Create Task": "Create Task"
 	},
 	"links": {
 		"contacts": "Contacts",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "1.0-rc1",
+  "version": "1.0-rc2",
   "description": "",
   "main": "index.php",
   "repository": "",