Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

This commit is contained in:
Julia Radzhabova 2016-04-14 14:40:48 +03:00
commit e4bbebc2bf

View file

@ -235,7 +235,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
window.g_debug_mode = true; window.g_debug_mode = true;
</script> </script>
@ -272,6 +272,7 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/autofilters.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/autofilters.js"></script>
@ -297,7 +298,6 @@
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script> <script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>