Commit graph

345 commits

Author SHA1 Message Date
Maxim Kadushkin cde02d1526 merge branches [newembed] and [bootstrap-3.3.7] 2016-11-11 16:59:11 +03:00
Julia Radzhabova 994ee98c00 Merge branch 'develop' into feature/bootstrap-3.3.7 2016-11-11 12:16:32 +03:00
Julia Radzhabova ad21492c29 Disable toolbar and right panel when lost editing rights (api method denyEditingRights). 2016-11-10 15:38:26 +03:00
Maxim Kadushkin e63a24cecf added less v 2.7.1, removed unused resources 2016-11-10 14:48:41 +03:00
Alexander.Trofimov 4f491a750c c_oAscVerticalTextAlign -> c_oAscVAlign
TEXT_ALIGN_BOTTOM -> Bottom
TEXT_ALIGN_CTR -> Center
TEXT_ALIGN_DIST -> Dist
TEXT_ALIGN_JUST -> Just
TEXT_ALIGN_TOP -> Top
2016-11-10 14:24:18 +03:00
Julia Radzhabova 3134a3f73c [DE] [PE] Change layout for chart settings in the right panel. 2016-11-10 12:37:28 +03:00
Julia Radzhabova 5f82b1e5cd Update translations. 2016-11-08 11:53:01 +03:00
Julia Radzhabova d0636e8a06 [DE] Update styles for bootstrap-3.3.7 2016-11-03 13:41:44 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova 6804c4a2de [DE] Disable language button in the status bar until languages are loaded. 2016-11-02 16:40:35 +03:00
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 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova af438ff5f2 Update translations. 2016-10-25 16:46:21 +03:00
Julia Radzhabova d3748cdd94 [DE][SSE] 1 call of fillEquations. 2016-10-24 13:58:34 +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 b9d5642a44 [DE] Move DE.define to Common 2016-10-21 13:54:36 +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
Alexander Trofimov 8dcd118e42 Merge pull request #35 from ONLYOFFICE/feature/build-version
Feature/build version
2016-10-19 17:58:57 +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 bfc91dc91f [DE] Optimization of right panel. 2016-10-18 11:26:16 +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 ee13c7a3f3 [DE] Fix Bug 33038. 2016-10-13 11:40:59 +03:00
Julia Radzhabova f59b72e9ac [DE] [SSE] Init shape settings in the right panel before first opening. 2016-10-12 18:38:10 +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 c4da0e12d8 [DE] Field "serverVersion" is added to revision in versions history. 2016-10-07 16:37:18 +03:00
Julia Radzhabova 7e1f1ebc5b [DE] Check build versions for editor and revisions in versions history. 2016-10-05 17:08:53 +03:00
Julia Radzhabova f9613e3a3c File menu: Back to Document -> Close menu. 2016-10-05 16:33:10 +03:00
Julia Radzhabova 379d61e759 [DE] Version history: add "Show/Hide detailed changes" to history panel. Don't reload editor, when press Back to Document (= Close Menu) in the File menu. 2016-10-05 16:31:49 +03:00
Julia Radzhabova ec2ee7128b [DE] Version history: show changes by default. 2016-10-04 17:12:23 +03:00
Julia Radzhabova 71390d54be [DE] Add pages count to document. 2016-10-04 15:05:12 +03:00
Julia Radzhabova 640fa5e48b [DE] Fix bug with apply cells background color from Table advanced settings (table spacing is true, cells are selected). 2016-09-30 16:10:46 +03:00
Julia Radzhabova 46b1dd5567 [DE] Fix bug 13065 2016-09-30 16:08:11 +03:00
Julia Radzhabova 811757a8bc Show shape (not text art) settings in the right panel when selecting shape or text art. Show text art settings when adding text art to document. 2016-09-29 16:26:05 +03:00
Julia Radzhabova 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Julia Radzhabova 954f36aeff [DE] Fix Bug 33142. 2016-09-26 15:07:51 +03:00
Julia Radzhabova a362235acf Rename file from editors. 2016-09-26 13:54:25 +03:00
Julia Radzhabova f55ce0d375 [DE] Don't restore last version. Don't show changes by default. 2016-09-22 14:57:41 +03:00
Julia Radzhabova 2afdb191df [DE] Update layout for history versions + hide changes for revision. 2016-09-22 12:43:31 +03:00
Julia Radzhabova 5739d6cd73 Merge pull request #34 from ONLYOFFICE/feature/restore-version
Feature/restore version
2016-09-21 13:35:44 +03:00
Julia Radzhabova 920dc6002a [DE] Added hint to Restore button in the version history. 2016-09-20 18:36:32 +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 b33f00e0a7 [DE] Restore from changes in versions history. 2016-09-19 10:41:02 +03:00
Julia Radzhabova 4dc23c41ee [DE] Added the ability to restore version in versions history (need event onRequestRestore and permissions.changeHistory = true in editor config). 2016-09-16 15:46:00 +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 428bddd013 Merge pull request #29 from ONLYOFFICE/hotfix/v4.1.2
[DE] Bug with delayed loading of toolbar.
2016-09-13 11:43:12 +03:00
Julia Radzhabova 24ae06f271 [DE] Bug with delayed loading of toolbar. 2016-09-13 11:41:33 +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
Julia Radzhabova fbf371080a Revert commit 2bb4486c72 (Bug 29737). 2016-09-09 17:52:19 +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 1f76033e5d [DE] Changed pluigns config. 2016-09-05 16:06:24 +03:00
Julia Radzhabova c1333599b9 [DE][SSE] Update zoom value in the toolbar menu when editor is loading. 2016-09-02 15:30:55 +03:00
Julia Radzhabova d64d58daa7 [DE] Repeat Commit: 7a2e173409 [7a2e173]
Set full toolbar in light version.
2016-09-01 14:49:33 +03:00
Julia Radzhabova 1c5cfdb400 Added license type Asc.c_oLicenseResult.ExpiredTrial. 2016-08-30 13:30:11 +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
Julia Radzhabova 9d43ac5a4b [DE] Fix Bug 32999. 2016-08-29 11:16:31 +03:00
Julia Radzhabova 3342f6e62e [DE desktop] Bug with editor loading. 2016-08-23 14:36:55 +03:00
Alexey Golubev c47166ca47 Merge branch 'develop' of github.com:ONLYOFFICE/web-apps into develop 2016-08-23 11:52:13 +03:00
Julia Radzhabova 880fad0c9f [DE][SSE] Loading text arts and equations when editors are opened with compact toolbar. 2016-08-23 11:50:19 +03:00
Alexey Golubev 7a1cbfc141 Merge branch 'hotfix/v4.0.4' into develop 2016-08-23 11:49:50 +03:00
Julia Radzhabova 9f3c4cc909 [DE] Fix Bug 32975. 2016-08-23 11:25:57 +03:00
Julia Radzhabova f1d781df3a [DE] Fix Bug 32974. 2016-08-23 09:41:53 +03:00
Julia Radzhabova d38c871476 Merge branch 'develop' into refactor 2016-08-19 17:20:32 +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 1a02a40dec [DE][PE] Table Settings: Change border color when theme colors are changed. 2016-08-18 10:58:30 +03:00
Julia Radzhabova 289f68bd96 [DE] Delay rendering color scheme and pagebreak menu on toolbar. 2016-08-17 16:25:21 +03:00
Julia Radzhabova d2e2879b63 Merge branch 'develop' into refactor 2016-08-17 14:57:03 +03:00
Julia Radzhabova 9c5b6f5ba5 [DE] Bug with mail merge: select locked paragraph, press Mail merge button on the toolbar, select xls file -> Mail merge settings on the right panel are not disabled (Insert Merge fields must be disabled). 2016-08-17 14:55:28 +03:00
Julia Radzhabova 2291189235 [DE] Delay rendering controls on the right panel. 2016-08-17 12:55:21 +03:00
Julia Radzhabova 252ef52606 [DE] Delay rendering controls on the right panel. 2016-08-16 16:55:14 +03:00
Julia Radzhabova a27da8e193 Updated translations. 2016-08-16 15:52:18 +03:00
Julia Radzhabova 795c85884e [DE] Changed advanced settings. 2016-08-16 13:20:46 +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 a18be3f5ac Merge branch 'develop' into refactor 2016-08-12 15:28:53 +03:00
Julia Radzhabova 98c04632d2 [DE] Refactoring + disable "insert page number to current position" when paragraph is disabled. 2016-08-12 15:04:12 +03:00
Julia Radzhabova 9f20d9d4d4 [DE][SSE] Open protected files. 2016-08-10 12:33:08 +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
Maxim Kadushkin 3e82cb1af3 delayed load for the menu of some buttons 2016-08-04 20:02:57 +03:00
Maxim Kadushkin e719bb3f52 initialize scroller before the menu opened 2016-08-04 20:00:42 +03:00
Maxim Kadushkin bab0bfc3ba hints moved in delayed load 2016-08-04 18:47:44 +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