Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1627 commits 47 branches 5000 tags 623 MiB
Commit graph

369 commits

Author SHA1 Message Date
Julia Radzhabova a8dbadb2ae Update translations. 2016-10-28 16:52:51 +03:00
Julia Radzhabova 2b4ebdefa1 Changed branding permissions. Use canBranding from license to hiding panels. 2016-10-28 16:38:33 +03:00
Julia Radzhabova 75a175b426 Merge pull request #38 from ONLYOFFICE/hotfix/v4.1.7 
Hotfix/v4.1.7
 2016-10-28 14:51:47 +03:00
Julia Radzhabova 67cdfb5592 Fix bug with underscore _.each method in IE9. 2016-10-27 14:39:54 +03:00
Julia Radzhabova 28bdc1b91a Update translations. 2016-10-27 13:38:24 +03:00
Julia Radzhabova cf53fc04a1 [PE][SSE] Debug context menu for equations. 2016-10-26 16:20:51 +03:00
Julia Radzhabova 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova c40b96d685 Update translations. 2016-10-26 13:30:55 +03:00
Julia Radzhabova af438ff5f2 Update translations. 2016-10-25 16:46:21 +03:00
Julia Radzhabova 054319793f [PE] Added equations. 2016-10-25 13:48:31 +03:00
Julia Radzhabova 04acc3ecc8 Autostart plugin after loading plugins. 2016-10-21 17:09:58 +03:00
Julia Radzhabova 1058d48f46 Add parameters to config for hiding toolbar, left menu, right menu. 2016-10-21 16:47:46 +03:00
Julia Radzhabova ed441aac53 [PE] Update toolbar icons. 2016-10-21 13:55:31 +03:00
Julia Radzhabova f5fb3f94f5 Merge branch 'develop' into feature/refactor 2016-10-20 11:59:23 +03:00
Julia Radzhabova 3eecfa1e83 [PE] Delayed loading for some of the toolbar controls. 2016-10-20 11:55:54 +03:00
Julia Radzhabova 1bcc69da7a Get edit rights from server config: asc_getRights. Used to set singletone mode 2016-10-20 10:22:16 +03:00
Julia Radzhabova fb0e00edb9 [PE] Hints in the toolbar are moved to delayed loading. 2016-10-19 16:30:26 +03:00
Julia Radzhabova 65ec79e1a8 [PE] Delay rendering controls on the right panel (slide settings). 2016-10-19 15:54:43 +03:00
Julia Radzhabova 4048b849f8 Optimization for mouse click to document: replace heavy bootstrap function clearMenus. Elements with data-toggle=dropdown must have class dropdown-toggle. 2016-10-19 14:16:46 +03:00
Julia Radzhabova a7e603ca5f [PE] [SSE] Optimization of right panel. 2016-10-18 11:58:27 +03:00
Julia Radzhabova ccd2a7fcea Merge branch 'develop' into feature/refactor 2016-10-14 17:13:51 +03:00
Julia Radzhabova 963202b919 Fix layout in the status bar panel with users count in co-authoring mode. 2016-10-14 17:00:48 +03:00
Julia Radzhabova b303c38d94 Fixed bug: change focus from text field or textarea to another text field or textarea (e.g. click to fiedls in the search dialog in replace mode). 2016-10-14 16:58:57 +03:00
Julia Radzhabova 3e5fff37e8 [PE] Delay rendering controls on the right panel (shape, textart settings) + init shape settings in the right panel before first opening.. 2016-10-14 13:48:04 +03:00
Julia Radzhabova a4acc71b13 Merge branch 'develop' into feature/refactor 2016-10-14 11:40:06 +03:00
Julia Radzhabova 0dd09875b8 Disable download as, print, save and version history when server is disconnected. 2016-10-12 16:32:48 +03:00
Julia Radzhabova 50a5653fb4 [PE] Delay rendering controls on the right panel. 2016-10-11 13:29:21 +03:00
Julia Radzhabova 65afc4894c [PE] Delay rendering controls in Chart Settings on the right panel. 2016-10-07 16:31:11 +03:00
Julia Radzhabova f9613e3a3c File menu: Back to Document -> Close menu. 2016-10-05 16:33:10 +03:00
Julia Radzhabova 10271fa79c [PE] Fix Bug 33178. 2016-10-04 12:47:18 +03:00
Julia Radzhabova a398c46d8d [PE] Open encrypted pptx. 2016-09-29 16:06:22 +03:00
Julia Radzhabova 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Julia Radzhabova a362235acf Rename file from editors. 2016-09-26 13:54:25 +03:00
Julia Radzhabova a9cc2ce9ad Merge branch 'hotfix/v4.1.2' into develop 2016-09-20 10:50:17 +03:00
Julia Radzhabova 2ea1534351 Updated translations 2016-09-19 18:21:41 +03:00
Julia Radzhabova 7749b95544 Added developer mode. 2016-09-19 17:04:56 +03:00
Julia Radzhabova b304d3e651 Fix Bug 33115. 2016-09-15 15:59:06 +03:00
Julia Radzhabova 7d4ce1c7a2 Fix bug with loader logo (when no logo-parameter). 2016-09-14 14:01:59 +03:00
Julia Radzhabova 376990a7a6 Added custom logo to loader of the editors (need parameter in config -> customization). 2016-09-14 12:45:10 +03:00
Julia Radzhabova 4e72c53a8a Load initial value for compact toolbar from editor config. 2016-09-13 15:03:32 +03:00
Julia Radzhabova 35d21fdb65 Load initial zoom value from editor config. 2016-09-13 11:28:21 +03:00
Julia Radzhabova 6cf46f4442 Bug 33044. 2016-09-13 09:40:44 +03:00
Alexey Golubev 2409aa1947 Merge tag 'v4.1.1' into develop 
v4.1.1
 2016-09-12 16:33:17 +03:00
Julia Radzhabova fbf371080a Revert commit 2bb4486c72 (Bug 29737). 2016-09-09 17:52:19 +03:00
Julia Radzhabova 665e3b77a5 Merge pull request #28 from ONLYOFFICE/hotfix/v4.1.1 
Hotfix/v4.1.1
 2016-09-08 19:29:05 +03:00
Julia Radzhabova 6812a5b9a0 [PE] Fix Bug 32442. 2016-09-08 15:04:31 +03:00
Julia Radzhabova a46308852c Updated plugin icons. 2016-09-07 14:58:12 +03:00
Julia Radzhabova a92ae8bf8f Fixed loading mask in plugin dialog. 2016-09-06 13:54:22 +03:00
Julia Radzhabova 6bfd3d80bb Absolute urls in plugins. 2016-09-05 18:28:56 +03:00
Julia Radzhabova f821bd04fa [PE][SSE] Changed pluigns config. 2016-09-05 17:43:29 +03:00
Julia Radzhabova 338496d02f [PE] refactoring 2016-08-30 14:48:49 +03:00
Julia Radzhabova 1c5cfdb400 Added license type Asc.c_oLicenseResult.ExpiredTrial. 2016-08-30 13:30:11 +03:00
Julia Radzhabova 7dc8c7534b [PE] Fix Bug 32042. 2016-08-30 11:34:27 +03:00
Julia Radzhabova b3e6c31393 [PE] Fix bug 33002, changes for bug 32497 2016-08-30 11:31:31 +03:00
Julia Radzhabova 878f1880c3 Point chart -> XY (Scatter) Chart 2016-08-29 16:46:31 +03:00
Julia Radzhabova 4ffe882f08 Fix Bug 33027. 2016-08-29 16:45:10 +03:00
Julia Radzhabova a69dd755bd Added support for different license types. 2016-08-29 14:46:15 +03:00
Julia Radzhabova 2bb4486c72 Fixed Bug 29737. 2016-08-29 14:32:04 +03:00
Alexey Golubev 7a1cbfc141 Merge branch 'hotfix/v4.0.4' into develop 2016-08-23 11:49:50 +03:00
Julia Radzhabova de773f8618 Debug opening/moving/resizing menus, dialogs, tips and others (using mouse events), when browser zoom != 100%. 2016-08-19 16:41:48 +03:00
Julia Radzhabova 35e67155b3 [PE] Fix Bug 32497. 2016-08-19 09:18:45 +03:00
Julia Radzhabova 1a02a40dec [DE][PE] Table Settings: Change border color when theme colors are changed. 2016-08-18 10:58:30 +03:00
Julia Radzhabova a27da8e193 Updated translations. 2016-08-16 15:52:18 +03:00
Julia Radzhabova 82d839ec26 Bug 32932. 2016-08-16 13:05:58 +03:00
Julia Radzhabova 4cbd0ad7e2 In light version default value for Autosave is off. 2016-08-16 13:01:23 +03:00
Julia Radzhabova be7c3de41d Limited size of warning window (use autosize or maximum width). 2016-08-09 12:25:34 +03:00
Julia Radzhabova 0c14aeb191 Limited size of warning window. 2016-08-08 17:14:53 +03:00
Julia Radzhabova 7e75a2a226 Refactoring ThemeColorPalette component. 2016-08-08 17:13:39 +03:00
Julia Radzhabova 1fe2a5066a Add "initOnSelectionChanged" parameter to plugins. 2016-08-08 16:27:00 +03:00
Julia Radzhabova 842f902712 [PE] Edit ole-objects. 2016-08-08 16:13:57 +03:00
Julia Radzhabova a04a34f21a [PE] Check editors support when loading plugins. 2016-08-08 16:06:04 +03:00
Alexey Golubev 4dec00ebac Merge tag 'v4.0.3' into develop 
v4.0.3

Conflicts:
	Readme.md
 2016-08-04 16:31:09 +03:00
Julia Radzhabova 4d9125372f Update plugin window resizing. 2016-08-04 16:03:17 +03:00
Julia Radzhabova 7a2e173409 Set full toolbar in light version. 2016-08-03 14:51:21 +03:00
Julia Radzhabova a518abfcae Fixed bug with initial size and resizing for plugins window. 2016-08-02 13:55:45 +03:00
Julia Radzhabova e10b46c0fc Fix bug with text input after mouse click to left/right panels, toolbar or statusbar. 2016-07-28 15:37:58 +03:00
Julia Radzhabova 0293d46a71 [PE] Fix Bug 32561. 2016-07-26 17:53:03 +03:00
Julia Radzhabova 9297531dff Update copy/cut/paste from toolbar and context menu. 2016-07-26 17:46:42 +03:00
Julia Radzhabova 7cb5aa9075 [PE] Add plugins. 2016-07-26 14:45:41 +03:00
Julia Radzhabova 7e1b5517d7 fix bug 32851. 2016-07-25 10:56:39 +03:00
Julia Radzhabova 59f93b6b7d Align controls in texture-fill settings. 2016-07-08 17:03:42 +03:00
Julia Radzhabova aeccc51d5f Merge pull request #12 from ONLYOFFICE/release/4.0.1 
Release/4.0.1
 2016-07-08 16:48:56 +03:00
Julia Radzhabova 552ecb0c94 Add description for light version in about. 2016-07-08 15:53:41 +03:00
Julia Radzhabova 2e0c9c90a5 [PE] Editing oleObjects. 2016-07-08 14:39:00 +03:00
Julia Radzhabova e6e7be6f84 Fixed bugs with focus and keydown events in menus. 2016-07-08 12:25:30 +03:00
Julia Radzhabova f91ec42ead Merge pull request #10 from ONLYOFFICE/release/4.0.1 
Release/4.0.1
 2016-07-07 13:58:07 +03:00
Julia Radzhabova 56b75be8c2 Update limitations for light version: disable co-authoring. 2016-07-06 17:17:28 +03:00
Julia Radzhabova 23d5628380 Merge branch 'release/4.0.1' into develop 2016-07-05 14:37:48 +03:00
Julia Radzhabova 6a4e5d9877 Update translations. 2016-07-05 09:55:44 +03:00
Julia Radzhabova f7ea3a8cf1 Update translations. 2016-07-04 17:41:11 +03:00
Julia Radzhabova d7e63930e0 [PE][SSE] Shape/TextArt Settings: add stroke-line type. 2016-07-01 11:16:09 +03:00
Julia Radzhabova e5501d7692 [DE][PE] При загрузке редакторов с открытой правой панелью показывать настройки параграфа/слайда (контролы на панелях пустые и disabled). 2016-06-30 14:05:56 +03:00
Julia Radzhabova 85aeff23a5 Update translations. 2016-06-30 13:41:25 +03:00
Julia Radzhabova 68ba02c5b8 [PE][SSE] Limitations for light version (compact toolbar + hide chat/comments). 2016-06-30 12:38:54 +03:00
Julia Radzhabova 621583bf7f Не добавлялись автофигуры из списка на тулбаре. 2016-06-24 14:53:18 +03:00
Julia Radzhabova c2b3366d0f Merge branch 'release/3.8.1' into develop 2016-06-23 12:50:29 +03:00
Julia Radzhabova ff3143e955 Изменения в связи с правками в сдк для ввода иероглифов. 
fixed Bug 32701, fixed Bug 32696.
 2016-06-23 10:50:10 +03:00
Julia Radzhabova 217b9d0fde Обновлено сообщение об отсутствии лицензий в open source версии. 2016-06-23 09:45:41 +03:00
Julia Radzhabova c57254ba21 [DE][PE] При загрузке редакторов с открытой правой панелью показывать настройки параграфа/слайда (контролы на панелях пустые и disabled). 2016-06-21 17:30:02 +03:00
Julia Radzhabova 817c3ae386 Обновлены хэлпы. 2016-06-20 09:48:10 +03:00
Julia Radzhabova 53cbd00c14 [PE] добавлен недостающий файл к багу 30672. 2016-06-17 15:48:43 +03:00
Julia Radzhabova 84f4f2471c [PE] Bug 30672 - реализованы пункты a, b 2016-06-17 15:47:49 +03:00
Julia Radzhabova 3f8f42ac02 [PE] Добавлена настройка ориентации слайда. 2016-06-17 14:21:49 +03:00
Julia Radzhabova 210327a73a Обновлены переводы. Добавлен японский язык. 2016-06-16 17:18:08 +03:00
Julia Radzhabova c725feb667 fix bug 32580 2016-06-16 16:09:26 +03:00
konovalovsergey de3250c53a fix Bug 32641 - Окно печати вызывается через раз 2016-06-09 13:22:58 +03:00
Alexander.Trofimov 7a5d025854 send array of asc_CCommentData on asc_onAddComments event instead array of objects 2016-05-31 18:42:12 +03:00
Julia Radzhabova c6b48565b9 Обновлены переводы 2016-05-31 16:14:33 +03:00
Julia Radzhabova 21b670cef2 Минимальная ширина стилей в тулбаре выставлена таким образом, чтоб отображался хотя бы 1 стиль. 2016-05-26 11:44:52 +03:00
Julia Radzhabova 14fdcdd66e [DE, PE] Реализовано открытие пустой правой панели во время загрузки документа. fix Bug 32119 2016-05-25 10:44:18 +03:00
Julia Radzhabova 6b400523ef Обновлены переводы. 2016-05-24 18:22:15 +03:00
Julia Radzhabova 4d6f2579cd Обновлены хэлпы. 2016-05-24 17:18:39 +03:00
Julia Radzhabova b8a08ecf5a fixed Bug 32496 2016-05-24 16:05:42 +03:00
Julia Radzhabova 76a3ee98d8 [PE, SSE] Выставление опции сохранения пропорций для изображений, автофигур и диаграмм (см. баги 32442, 32436). 2016-05-24 14:45:53 +03:00
Julia Radzhabova 1f2f4cdcc5 [PE] Bug 32442 2016-05-24 12:07:44 +03:00
Julia Radzhabova 56af9c6c06 Отладка (удален повторный код). 2016-05-21 15:12:07 +03:00
Julia Radzhabova 4ee5489eb8 [PE] Поправка к bug 27793 2016-05-16 12:15:18 +03:00
Julia Radzhabova c864a112ce Убрала проверку zoom-а браузера при загрузке редакторов. 2016-05-15 13:51:51 +03:00
Julia Radzhabova 6d433bb6ab Список файлов сдк, подключаемый в index.html, вынесен в отдельный файл sdk_dev_scripts. 2016-05-13 14:23:09 +03:00
Alexander.Trofimov e1612fbaf6 add api config 2016-05-13 11:37:54 +03:00
Alexander.Trofimov 02ce684cc7 slides -> sdk-all + sdk-all-min 2016-05-10 18:54:16 +03:00
Sergey Luzyanin 5a42f0c4e8 add GraphicObjectBase.js 2016-05-10 18:15:31 +03:00
Julia Radzhabova 6779514185 [PE] изменено место вызова onApiPageSize. 2016-05-10 18:08:07 +03:00
Julia Radzhabova 1fe057d4b4 asc_onInitEditorShapes and get_PropertyEditorShapes -> asc_getPropertyEditorShapes 2016-05-10 16:46:51 +03:00
Alexander.Trofimov 5158b47a9f flat_desine before create api 2016-05-10 14:52:24 +03:00
Julia Radzhabova aead32ecd2 Изменение функций в сдк. 2016-05-10 14:44:17 +03:00
Julia Radzhabova e8733eb8b2 [PE] Загрузка текстур для слайда и текстарта по аналогии с редактором таблиц (по событию). 2016-05-06 16:46:04 +03:00
Julia Radzhabova e6fad877c0 [PE] Загрузка текстур для автофигур по аналогии с редактором таблиц (по событию). 2016-05-06 14:45:21 +03:00
Alexander.Trofimov a58de1a68a add fictive load sdk-all in develop version 
delete apiExport
TextBodyPrototype -> TextBodyPrototype.js
 2016-05-05 14:25:34 +03:00
Alexander.Trofimov 79bfa777f8 delete asc_SetFontsPath 
route fonts by path "fonts/"
 2016-05-05 14:07:51 +03:00
Alexander.Trofimov e7acc4fdb7 load only sdk-all-min.js file 2016-05-05 13:09:49 +03:00
Alexander.Trofimov 14b6f64895 add files to index.html 2016-05-04 18:39:29 +03:00
Ilya Kirillov c0ec5035eb Добавлен файл DocumentContentBase. 2016-05-04 13:11:22 +03:00
Alexander.Trofimov b6e18ebc97 revert editor changes 2016-04-29 17:19:03 +03:00
Alexander.Trofimov 724a533468 revert move files from word/Editor 2016-04-29 15:06:49 +03:00
Alexander.Trofimov 749bf13e0c common/editor/paragraphContent to function-closure 2016-04-29 13:18:42 +03:00
Alexander.Trofimov 97349cdc19 paragraphContent.js to common 2016-04-29 11:46:36 +03:00
Alexander.Trofimov 25ca6866de common/editor/styles to function-closure 2016-04-29 11:40:00 +03:00
Alexander.Trofimov fe644ef088 move styles.js to common 2016-04-28 18:42:13 +03:00
Alexander.Trofimov beb0f1adfc common/editor/paragraph to function-closure 2016-04-28 18:35:38 +03:00
Julia Radzhabova 30e77f802b [PE] Баг с превью в полноэкранном режиме при наличии переходов между слайдами. 2016-04-28 17:43:48 +03:00
Alexander.Trofimov c949f14d89 move document.js to common 2016-04-28 14:00:29 +03:00
Julia Radzhabova 00edd5d736 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2016-04-28 13:52:31 +03:00
Julia Radzhabova 051ad0c99c Bug 32323 2016-04-28 13:51:22 +03:00
Alexander.Trofimov 3040aad6ac move documentContent to common 2016-04-28 13:47:28 +03:00
Alexander.Trofimov 9871b501f1 move GraphicFrame to common 2016-04-28 13:32:11 +03:00
Alexander.Trofimov 3014d7d1a2 cell/model/DrawingObjects/DrawingDocument to function-closure 2016-04-27 16:08:19 +03:00
Alexander.Trofimov ec10549620 delete word/Editor/SerializeCommon -> Serialize.js + SerializeWriter.js 2016-04-27 13:35:24 +03:00
Alexander.Trofimov cdd937fcbf cell/model/History to function-closure 
word/Editor/History to function-closure
 2016-04-27 12:13:18 +03:00
Alexander.Trofimov 53d8b1ef75 cell/model/Workbook to function-closure 2016-04-27 11:14:02 +03:00
Alexander.Trofimov 842ff73488 cell/model/WorkbookElems to function-closure 2016-04-26 18:54:56 +03:00
Alexander.Trofimov fd1ba48d35 SerializeWriter after Serialize 2016-04-26 17:39:00 +03:00
Alexander.Trofimov b2dd3d4c97 WorkEvents -> common 2016-04-26 14:45:32 +03:00
Alexander.Trofimov 03d25f0e9c move HatchPattern to common 
common/Drawings/HatchPattern to function-closure
 2016-04-26 13:38:20 +03:00
Alexander.Trofimov f7ea3bef43 common/Controls to function-closure 
common/Overlay to function-closure
 2016-04-26 13:29:08 +03:00
Alexander.Trofimov 340423c576 common/Shapes/EditorSettings to function-closure 2016-04-26 12:02:26 +03:00
Alexander.Trofimov c5e3e0c018 common/SerializeChart to function-closure 2016-04-26 10:47:38 +03:00
Alexander.Trofimov 9d6f94f92d common/SerializeCommonWordExcel to function-closure 2016-04-26 10:32:18 +03:00
Alexander.Trofimov 466ad96db2 move files 2016-04-25 18:32:36 +03:00
Alexander.Trofimov 2d857ef5f6 word/Drawing/Externals to function-closure 
common/GlobalLoaders to function-closure
 2016-04-25 18:26:41 +03:00
Alexander.Trofimov b1a8322ccc add TextMeasurer.js 2016-04-25 14:56:15 +03:00
Alexander.Trofimov fcf8a6ec1a g_oTextMeasurer to closure 2016-04-25 14:09:45 +03:00
Alexander.Trofimov e954e3cb94 common/FontsFreeType/font_map to function-closure 2016-04-25 11:44:52 +03:00
Alexander.Trofimov 5db14c1256 common/FontsFreeType/font_engine to function-closure 2016-04-22 17:35:25 +03:00
Alexander.Trofimov 2fbfeccd7d common/Drawings/TextDrawer to function-closure 2016-04-22 15:49:45 +03:00
Alexander.Trofimov 1ae1853696 common/Drawings/DrawingObjectsHandlers to function-closure 
delete common/Drawings/Joined.js
 2016-04-22 15:32:53 +03:00
Alexander.Trofimov df3cbff94f common/Drawings/TrackObjects/ResizeTracks to function-closure 
common/Drawings/TrackObjects/RotateTracks to function-closure
common/Drawings/TrackObjects/Spline to function-closure
 2016-04-22 15:14:24 +03:00
Alexander.Trofimov 637cb4a65d common/Drawings/TrackObjects/AdjustmentTracks to function-closure 
common/Drawings/TrackObjects/MoveTracks to function-closure
common/Drawings/TrackObjects/NewShapeTracks to function-closure
common/Drawings/TrackObjects/PolyLine to function-closure
 2016-04-22 14:53:29 +03:00
Alexander.Trofimov 9e8f01db3d common/Drawings/States to function-closure 
word/Editor/GraphicObjects/DrawingStates to function-closure
 2016-04-22 14:40:44 +03:00
Alexander.Trofimov 22d856135e common/Drawings/Hit to function-closure 2016-04-22 13:56:53 +03:00
Alexander.Trofimov 81b9cd24db common/Drawings/ColorArray to function-closure 2016-04-22 13:49:47 +03:00
Alexander.Trofimov 0c4132565c common/Drawings/ArcTo to function-closure 2016-04-22 13:43:53 +03:00
Alexander.Trofimov 1724b30632 delete duplicate file 
use common/Drawings/ColorArray.js
 2016-04-22 13:33:08 +03:00
Alexander.Trofimov 721ee7ecc7 common/Charts/3DTransformation to function-closure 2016-04-22 13:18:44 +03:00
Alexander.Trofimov d636d00407 delete common/Drawings/Math.js (all functions and variables exist in common/Drawings/Format/Geometry.js) 2016-04-21 15:25:14 +03:00
Alexander.Trofimov 473d21f8a4 common/Drawings/Format/Shape to function-closure 2016-04-21 15:06:43 +03:00
Julia Radzhabova 6369c32be1 Bug 32194. 2016-04-21 14:47:28 +03:00
Alexander.Trofimov ff0f608311 common/wordcopypaste to function-closure 2016-04-20 12:04:49 +03:00
Alexander.Trofimov 0826558672 common/NumFormat to function-closure 2016-04-19 18:06:33 +03:00
Julia Radzhabova ab9da153e6 Merge branch 'develop' into feature/metric-translate 2016-04-19 17:26:17 +03:00
Julia Radzhabova 7599123a67 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2016-04-19 11:59:57 +03:00
Alexander.Trofimov 3180c98ee2 to Asc namespace 2016-04-18 15:21:15 +03:00
Alexander.Trofimov bf049fedb9 update files order 2016-04-15 14:53:43 +03:00
Julia Radzhabova ae19165f88 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2016-04-14 12:44:48 +03:00
Maxim Kadushkin fdc8162719 bug 31994 2016-04-14 12:25:48 +03:00
Julia Radzhabova 271bbc70d6 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2016-04-14 10:04:53 +03:00
Alexander.Trofimov 73c9c6a1e1 update files order 2016-04-13 19:27:41 +03:00
Julia Radzhabova ebddb529df По просьбе отд. техподдержки и проектирования изменено сообщение об отсутствии лицензии (для использования в Enterprise Edition и Integration Edition). 2016-04-13 15:40:58 +03:00
Julia Radzhabova 11367d0108 Bug 18314. 2016-04-11 11:05:14 +03:00
Alexander.Trofimov 762f717297 fix bug 32130 2016-04-08 16:39:20 +03:00
Julia Radzhabova 7bf15f88c6 В конфиг редакторов добавлен параметр location: передается двухбуквенный код страны, по которому определяется метрика по-умолчанию (us, ca - дюймы). 2016-04-08 11:55:15 +03:00
Julia Radzhabova 66771e0b0d Merge branch 'develop' into feature/metric-translate 2016-04-07 15:13:16 +03:00
Alexander.Trofimov 0a1605faab delete unused scripts from index.html 2016-04-07 14:42:07 +03:00
Alexander.Trofimov 9569f09414 c_oAscDocumentUnits - > Asc.c_oAscDocumentUnits 2016-04-07 12:17:34 +03:00
Alexander Trofimov e054f11cd7 Merge pull request #1 from ONLYOFFICE/feature/remove-global-variables 
Feature/remove global variables
 2016-04-07 13:12:16 +04:00
Julia Radzhabova 8127d06270 Отладка выставления единиц измерения. 2016-04-06 18:34:04 +03:00
Julia Radzhabova cd160b63b8 [DE] [PE] Выставление единиц измерения в сдк. 2016-04-06 18:18:40 +03:00
Julia Radzhabova de6b5dc3e3 В список единиц измерения добавлены дюймы. 2016-04-06 18:17:40 +03:00
Julia Radzhabova 63b6a59342 Реализована локализация единиц измерения (Cm, Pt). 2016-04-06 16:38:54 +03:00
Alexander.Trofimov 229679925d add apiExport to index.html 2016-04-05 16:03:54 +03:00