Merge branch 'stable'

Gruntfile.js

@@ -147,7 +147,7 @@ module.exports = function (grunt) {
 				dot: true,
 				src: '**',
 				cwd: 'build/tmp',
-				dest: 'build/EspoCRM-<%= pkg.espoVersion %>/',
+				dest: 'build/EspoCRM-<%= pkg.version %>/',
 			},
 		},
 		replace: {
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
 					patterns: [
 						{
 							match: 'version',
-							replacement: '<%= pkg.espoVersion %>'
+							replacement: '<%= pkg.version %>'
 						}
 					]
 				},
@@ -187,12 +187,12 @@ module.exports = function (grunt) {
 		compress: {
 			final: {
 				options: {
-					archive: 'build/EspoCRM-<%= pkg.espoVersion %>.zip',
+					archive: 'build/EspoCRM-<%= pkg.version %>.zip',
 					mode: 'zip'
 				},
 				src: ['**'],
-				cwd: 'build/EspoCRM-<%= pkg.espoVersion %>',
-				dest: 'EspoCRM-<%= pkg.espoVersion %>'
+				cwd: 'build/EspoCRM-<%= pkg.version %>',
+				dest: 'EspoCRM-<%= pkg.version %>'
 			}
 		}
 	});

application/Espo/Core/UpgradeManager.php

@@ -33,29 +33,4 @@ class UpgradeManager extends Upgrades\Base
 		'after' => 'AfterUpgrade',
 	);
 
-	/**
-	 * Main upgrade process
-	 *
-	 * @param  string $upgradeId Upgrade ID, gotten in upload stage
-	 * @return bool
-	 */
-	public function run($upgradeId)
-	{
-		/** set writable permission for espo */
-		$permissionRes = $this->getFileManager()->getPermissionUtils()->setMapPermission(array('0664', '0775'));
-		if (!$permissionRes) {
-			throw new Error( 'Permission denied for the following items: /'. implode(', /', $this->getFileManager()->getPermissionUtils()->getLastError()) );
-		}
-
-		parent::run($upgradeId);
-
-		/** return the previous permission */
-		$permissionRes = $this->getFileManager()->getPermissionUtils()->setMapPermission();
-		if (!$permissionRes) {
-			throw new Error( 'Permission denied for the following items: '. implode(', ', $this->getFileManager()->getPermissionUtils()->getLastError()) );
-		}
-	}
-
-
-
 }

frontend/client/src/views/modals/image-preview.js

@@ -29,7 +29,7 @@ Espo.define('Views.Modals.ImagePreview', 'Views.Modal', function (Dep) {
 
 		template: 'modals.image-preview',
 		
-		size: 'xlarge',
+		size: 'x-large',
 
 		data: function () {
 			return {

package.json

@@ -1,7 +1,6 @@
 {
   "name": "espocrm",
-  "version": "1.0.0",
-  "espoVersion": "1.1-dev",
+  "version": "1.1.0",
   "description": "",
   "main": "index.php",
   "repository": "",