Merge pull request #1 from ONLYOFFICE/release/3.8.0

Release/3.8.0

3rd-Party.txt

@@ -1,138 +1,133 @@
 ONLYOFFICE DocumentServer uses code from the following 3rd party projects.
 
-1. Bootstrap 	- Bootstrap is a free collection of tools for creating websites and web applications. It contains HTML and CSS-based design templates for typography, forms, buttons, navigation and other interface components, as well as optional JavaScript extensions.
+1. Bootstrap - Bootstrap is a free collection of tools for creating websites and web applications. It contains HTML and CSS-based design templates for typography, forms, buttons, navigation and other interface components, as well as optional JavaScript extensions.
 
-URL: 			http://getbootstrap.com
-License:        Apache License Version 2.0
-License File:   ThirdParty\License\Bootstrap.license 
+URL:             http://getbootstrap.com
+License:         Apache License Version 2.0
+License File:    license/Bootstrap.license 
 
 
-2. RequireJS 	- RequireJS is a JavaScript file and module loader. It is optimized for in-browser use, but it can be used in other JavaScript environments, like Rhino and Node. Using a modular script loader like RequireJS will improve the speed and quality of your code.
+2. RequireJS - RequireJS is a JavaScript file and module loader. It is optimized for in-browser use, but it can be used in other JavaScript environments, like Rhino and Node. Using a modular script loader like RequireJS will improve the speed and quality of your code.
 
-URL:			http://requirejs.org/
+URL:            http://requirejs.org/
 License:        The "New" BSD License, MIT License
-License File:   ThirdParty\License\RequireJS.license
+License File:   license/RequireJS.license
 
 
-3. jQuery 		- jQuery is a fast, small, and feature-rich JavaScript library.
+3. jQuery - jQuery is a fast, small, and feature-rich JavaScript library.
 
-URL:			https://jquery.org
-License:       	MIT License
-License File:   ThirdParty\License\jQuery.license
+URL:            https://jquery.org
+License:        MIT License
+License File:   license/jQuery.license
 
 
-4. Megapixel 	- MFixes iOS6 Safari's image file rendering issue for large size image (over mega-pixel), which causes unexpected subsampling when drawing it in canvas.
+4. Megapixel - MFixes iOS6 Safari's image file rendering issue for large size image (over mega-pixel), which causes unexpected subsampling when drawing it in canvas.
 
-URL:			https://github.com/stomita/ios-imagefile-megapixel
-License:       	MIT License
-License File:   ThirdParty\License\Megapixel.license
+URL:            https://github.com/stomita/ios-imagefile-megapixel
+License:        MIT License
+License File:   license/Megapixel.license
 
 
-5. SockJS 		- WebSocket emulation - Javascript client
+5. SockJS - WebSocket emulation - Javascript client
 
-URL:			http://sockjs.org
-License:       	MIT License
-License File:   ThirdParty\License\SockJS.license
+URL:            http://sockjs.org
+License:        MIT License
+License File:   license/SockJS.license
 
 
-6. Sencha Touch	- a high-performance HTML5 mobile application framework, is the cornerstone of the Sencha HTML5 platform. Built for enabling world-class user experiences, Sencha Touch is the only framework that enables developers to build powerful apps that work on iOS, Android, BlackBerry, Windows Phone, and more.
+6. Sencha Touch - a high-performance HTML5 mobile application framework, is the cornerstone of the Sencha HTML5 platform. Built for enabling world-class user experiences, Sencha Touch is the only framework that enables developers to build powerful apps that work on iOS, Android, BlackBerry, Windows Phone, and more.
 
-URL:			http://www.sencha.com/products/touch
-License:       	GPLv3
-License File:   ThirdParty\License\Touch.license
+URL:            http://www.sencha.com/products/touch
+License:        GPLv3
+License File:   license/Touch.license
 
 
-7.  Underscore 	- Underscore is a utility-belt library for JavaScript that provides a lot of the functional programming support that you would expect in Prototype.js (or Ruby), but without extending any of the built-in JavaScript objects. It's the tie to go along with jQuery's tux, and Backbone.js's suspenders.	
+7.  Underscore - Underscore is a utility-belt library for JavaScript that provides a lot of the functional programming support that you would expect in Prototype.js (or Ruby), but without extending any of the built-in JavaScript objects. It's the tie to go along with jQuery's tux, and Backbone.js's suspenders.
 
-URL:			https://github.com/jashkenas/underscore/
-License:       	MIT License
-License File:   ThirdParty\License\Underscore.license
+URL:            https://github.com/jashkenas/underscore/
+License:        MIT License
+License File:   license/Underscore.license
 
 
-8. XRegExp 		- XRegExp is an open source (MIT License) JavaScript library that provides augmented and extensible regular expressions. You get new syntax, flags, and methods beyond what browsers support natively. XRegExp is also a regex utility belt with tools to make your client-side grepping simpler and more powerful, while freeing you from worrying about pesky cross-browser inconsistencies and the dubious lastIndex property.
+8. XRegExp - XRegExp is an open source (MIT License) JavaScript library that provides augmented and extensible regular expressions. You get new syntax, flags, and methods beyond what browsers support natively. XRegExp is also a regex utility belt with tools to make your client-side grepping simpler and more powerful, while freeing you from worrying about pesky cross-browser inconsistencies and the dubious lastIndex property.
 
-URL:			http://xregexp.com/
-License:       	MIT License
-License File:   ThirdParty\License\XRegExp.license
+URL:            http://xregexp.com/
+License:        MIT License
+License File:   license/XRegExp.license
 
 
 9. ZeroClipboard - The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface. 
 
-URL:			http://zeroclipboard.org
-License:       	MIT License
-License File:   ThirdParty\License\ZeroClipboard.license
-
+URL:            http://zeroclipboard.org
+License:        MIT License
+License File:   license/ZeroClipboard.license
 
-10. Hunspell 	- Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla Firefox 3 & Thunderbird, Google Chrome, and it is also used by proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and SDL Trados.
 
-URL:			http://sourceforge.net/projects/hunspell/
-License:       	MPL 1.1/GPL 2.0/LGPL 2.1
-License File:   ThirdParty\License\Hunspell.license
+10. Hunspell - Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla Firefox 3 & Thunderbird, Google Chrome, and it is also used by proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and SDL Trados.
 
+URL:            http://sourceforge.net/projects/hunspell/
+License:        MPL 1.1/GPL 2.0/LGPL 2.1
+License File:   license/Hunspell.license
 
-11. NodeHun		- The Hunspell binding for nodejs that exposes as much of hunspell as possible and also adds new features.	
 
-URL:			https://npmjs.org/package/nodehun
-License:       	MIT License
-License File:   ThirdParty\License\NodeHun.license
+11. NodeHun- The Hunspell binding for nodejs that exposes as much of hunspell as possible and also adds new features.
 
-12. AWSSDK 		- Amazon Web Services SDK for .NET. 
+URL:            https://npmjs.org/package/nodehun
+License:        MIT License
+License File:   license/NodeHun.license
 
-URL:			http://aws.amazon.com/sdkfornet/
-License:        Apache 2.0 license
-License File:   ThirdParty\License\AWS.license
 
+12. Backbone - Backbone.js gives structure to web applications by providing models with key-value binding and custom events, collections with a rich API of enumerable functions, views with declarative event handling, and connects it all to your existing API over a RESTful JSON interface.
 
-13. EnyimMemcached - C# Memcached client
+URL:            http://backbonejs.org/
+License:        MIT License
+License File:   license/Backbone.license
 
-URL:			https://github.com/enyim/EnyimMemcached
-License:        Apache 2.0 license
-License File:   ThirdParty\License\EnyimMemcached.license
 
+13. jQuery.browser - A jQuery plugin for browser detection.
 
-14. Ionic.Zip 	- DotNetZip is a FAST, FREE class library and toolset for manipulating zip files. Use VB, C# or any .NET language to easily create, extract, or update zip files.
+URL:            http://api.jquery.com/jquery.browser/
+License:        MIT License
+License File:   license/jQuery.browser.license
 
-URL:			http://dotnetzip.codeplex.com/
-License:        Microsoft Public License (Ms-PL)
-License File:   ThirdParty\License\DotNetZip.license
 
+14. PerfectScrollbar - Tiny but perfect jQuery scrollbar plugin.
 
-15. log4net 	- log4net is a tool to help the programmer output log statements to a variety of output targets.
+URL:            http://noraesae.github.com/perfect-scrollbar/
+License:        MIT License
+License File:   license/PerfectScrollbar.license
 
-URL:			http://logging.apache.org/log4net/
-License:        Apache 2.0 license
-License File:   ThirdParty\License\log4net.license
 
+15. jsrsasign - The 'jsrsasign' (RSA-Sign JavaScript Library) is a open source free pure JavaScript implementation of PKCS#1 v2.1 RSASSA-PKCS1-v1_5 RSA signing and validation algorithm.
 
-16. MySQL.Data.dll - Connector/Net is a fully-managed ADO.NET driver for MySQL.
+URL:            http://kjur.github.io/jsrsasign/
+License:        MIT License
+License File:   license/jsrsasign.license
 
-URL:			http://dev.mysql.com/downloads/connector/net/1.0.html	
-License:        GPL License v.2
-License File:   ThirdParty\License\MySQLDataMySQL.license
 
+16. JSZip - SZip is a javascript library for creating, reading and editing .zip files, with a lovely and simple API.
 
-17. Backbone - Backbone.js gives structure to web applications by providing models with key-value binding and custom events, collections with a rich API of enumerable functions, views with declarative event handling, and connects it all to your existing API over a RESTful JSON interface.
+URL:            http://stuk.github.io/jszip/
+License:        MIT license or the GPLv3 license
+License File:   license/jszip.license
 
-URL:			http://backbonejs.org/
-License:        MIT License
-License File:   ThirdParty\License\Backbone.license
 
+17. JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 
-18. Npgsql - Npgsql is a .Net Data Provider for Postgresql.
-URL:			http://npgsql.projects.pgfoundry.org/
-License:        Npgsql License
-License File:   ThirdParty\License\Backbone.license
+URL:            http://stuk.github.io/jszip-utils/
+License:        MIT license or the GPLv3 license
+License File:   license/jszip.license
 
 
-19. jQuery.browser - A jQuery plugin for browser detection.
+18. less - Less is a CSS pre-processor
 
-URL:			http://api.jquery.com/jquery.browser/
-License:        MIT License
-License File:   ThirdParty\License\jQuery.browser.license
+URL:            http://lesscss.org/
+License:        Apache 2 License
+License File:   license/less.license
 
 
-20. PerfectScrollbar - Tiny but perfect jQuery scrollbar plugin.
+19. requirejs-text - A RequireJS/AMD loader plugin for loading text resources
 
-URL:			http://noraesae.github.com/perfect-scrollbar/
+URL:            http://lesscss.org/
 License:        MIT License
-License File:   ThirdParty\License\PerfectScrollbar.license
+License File:   license/requirejs-text.license

Common/config/development-mac.json

@@ -23,6 +23,10 @@
           {
             "name": "/web-apps",
             "path": "../../../web-apps"
+          },
+          {
+            "name": "/sdkjs-plugins",
+            "path": "../../../sdkjs-plugins"
           }
         ]
       },

Common/config/development-windows.json

@@ -23,6 +23,10 @@
           {
             "name": "/web-apps",
             "path": "../../../web-apps"
+          },
+          {
+            "name": "/sdkjs-plugins",
+            "path": "../../../sdkjs-plugins"
           }
         ]
       },

DocService/sources/DocsCoServer.js

@@ -828,7 +828,7 @@ exports.install = function(server, callbackFunction) {
             yield canvasService.openDocument(conn, cmd);
             break;
           case 'changesError':
-            logger.error("changesError %s", data.stack);
+            logger.error("changesError: docId = %s %s", docId, data.stack);
             break;
           default:
             logger.debug("unknown command %s", message);

FileConverter/sources/converter.js

@@ -211,9 +211,7 @@ function pipeFile(fsFrom, fsTo) {
   });
 }
 function* processDownloadFromStorage(dataConvert, cmd, task, tempDirs) {
-  if (task.getFromOrigin()) {
-    dataConvert.fileFrom = path.join(tempDirs.source, 'origin');
-  } else if (task.getFromSettings()) {
+  if (task.getFromOrigin() || task.getFromSettings()) {
     dataConvert.fileFrom = path.join(tempDirs.source, 'origin.' + cmd.getFormat());
   } else {
     //перезаписываем некоторые файлы из m_sKey(например Editor.bin или changes)

Makefile

@@ -28,7 +28,7 @@ TOOLS_DIR = tools
 TOOLS_FILES = ../core/build/bin/AllFontsGen/linux_64
 TOOLS = $(OUTPUT)/$(TOOLS_DIR)/
 
-LICENSE_FILES = LICENSE.txt 3rd-Party.txt
+LICENSE_FILES = LICENSE.txt 3rd-Party.txt license/
 LICENSE = $(addsuffix $(OUTPUT)/, LICENSE_FILES)
 
 all: $(FILE_CONVERTER) $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(LICENSE)