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

2261 commits

Author SHA1 Message Date
Julia Radzhabova 42336eadec Merge branch 'feature/coauth-mode' into develop 2021-04-08 14:36:13 +03:00
Julia Radzhabova f4953e8b99 Show alert for c_oAscError.ID.ForceSaveTimeout error 2021-04-08 12:59:44 +03:00
Julia Radzhabova 2f5e7b4ef7 Use editorConfig.coEditing parameter for collaboration settings 2021-04-08 00:48:16 +03:00
Julia Radzhabova 3b146397ee
Merge pull request #796 from ONLYOFFICE/feature/resolve-comments 
Feature/resolve comments
 2021-04-07 23:06:35 +03:00
Maxim Kadushkin 2c0696ed12 Merge branch 'release/v6.3.0' into develop 2021-04-06 14:44:41 +03:00
Julia Radzhabova 33acee7d61 Resolve all comments 2021-04-06 10:53:53 +03:00
Oleg Korshul ec8b7b2a26 Remove tabs 2021-04-05 18:04:51 +03:00
Oleg Korshul 66ed60e991 Move install skin to config 2021-04-05 18:00:00 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +03:00
Julia Radzhabova c3fc27031f [PE] [DE] Draw list preview in sdk 2021-04-02 23:04:37 +03:00
Julia Radzhabova fc2bcf24bd [PE][SSE] Add api parameters for co-authoring mode 2021-04-02 22:36:08 +03:00
Julia Radzhabova 630c01105c Merge branch 'release/v6.3.0' into develop 2021-04-02 17:33:33 +03:00
maxkadushkin b6fbe5172b
Merge pull request #777 from ONLYOFFICE/feature/assets-update 
Change icons color to black
 2021-04-02 13:07:30 +03:00
Maxim Kadushkin f6f2048dab [all] fix bug 49231 2021-04-02 13:03:16 +03:00
Julia Radzhabova 7a4f207c14 Update translation 2021-04-02 12:12:40 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0 
Release/v6.3.0
 2021-04-02 11:53:39 +03:00
Julia Radzhabova 30e02a93fc Update translation 2021-04-02 11:39:51 +03:00
Maxim Kadushkin d016f27098 [all] changed icon name 2021-04-02 00:02:05 +03:00
JuliaSvinareva babe1233a9 [mobile] Add handler for try undo in fast collaborative 2021-04-01 23:27:58 +03:00
evgenykatyshev cd69ee0d02 Change icons color to black 
One more attempt
 2021-04-01 20:41:08 +03:00
SergeyEzhin 0bbd65fadd [PE mobile] Bug 47909, Bug 48110 2021-04-01 18:50:48 +03:00
Maxim Kadushkin b109057b01 [SSE PE] fix disabled state's icon 2021-04-01 11:15:52 +03:00
Maxim Kadushkin dba13ffbdf [all] fixed logo on bundled app version 2021-03-31 19:52:05 +03:00
SergeyEzhin dd3b5fafe0 [SSE mobile] Corrected some things 2021-03-30 17:51:53 +03:00
Julia Radzhabova 7e88e04dd2 For Bug 47092 2021-03-30 16:30:01 +03:00
JuliaSvinareva d1c32d886f [mobile] Fix add custom color 2021-03-30 16:19:20 +03:00
SergeyEzhin 5a090f8210 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes 2021-03-30 15:36:06 +03:00
Julia Radzhabova 1e18f144c2 Merge branch 'fix/request-close' into develop 2021-03-30 15:34:56 +03:00
Julia Radzhabova 767ddc4d54
Merge pull request #769 from ONLYOFFICE/fix/fix-scale 
Fix/fix scale
 2021-03-30 14:41:31 +03:00
Julia Radzhabova 5374c50ab6 [PE] Fix themes 2021-03-30 13:26:05 +03:00
Julia Radzhabova 8d54a7d1fb [PE] Fix themes list 2021-03-30 13:23:23 +03:00
Maxim Kadushkin 753a74a055 [all] fix bug 49214 2021-03-29 23:58:53 +03:00
Julia Radzhabova 22fc77c0a4 Fix closing editors 2021-03-29 16:41:49 +03:00
Julia Radzhabova 4da4514e97 [PE][DE] Fix show history 2021-03-29 16:40:05 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 84d357560e Add method requestClose (show warning on unsaved changes) 2021-03-29 14:30:31 +03:00
JuliaSvinareva f9f53e6dfc Merge branch 'feature/mobile-apps-on-reactjs-about' into feature/mobile-apps-on-reactjs 2021-03-29 13:38:22 +03:00
Julia Radzhabova eb84d1426a For Bug 49257 2021-03-29 12:04:02 +03:00
Julia Radzhabova c744b0896d
Merge pull request #762 from ONLYOFFICE/feature/comment-permissions 
Feature/comment permissions
 2021-03-29 11:23:21 +03:00
Julia Radzhabova 0e52ef704b Check unsaved changes before onRequestClose event 2021-03-28 23:59:55 +03:00
Julia Radzhabova e792f642d6 [PE] Add translation 2021-03-28 22:35:03 +03:00
Julia Radzhabova 78229a2bab Merge branch 'develop' into feature/comment-permissions 2021-03-28 22:18:19 +03:00
maxkadushkin 96633060b2
Merge pull request #761 from ONLYOFFICE/feature/gray-icons-black 
Feature/gray icons black
 2021-03-28 21:10:10 +03:00
Maxim Kadushkin a2c14d92e5 [all] fix bug 49251 2021-03-28 01:23:14 +03:00
JuliaSvinareva 4660a3ddcd [PE mobile] Fix context menu 2021-03-27 16:32:27 +03:00
Julia Radzhabova 6321f579d9 [PE] For Bug 49152 2021-03-27 01:21:17 +03:00
Julia Radzhabova bdd940623b Update translation 2021-03-27 01:02:56 +03:00
Julia Radzhabova 39ddc24254 Update translation 2021-03-27 00:12:55 +03:00
Julia Radzhabova 42633b97d5 Limit url size to 2084 characters 2021-03-26 23:54:37 +03:00
Julia Radzhabova 0b3d221b5b Fix Bug 49256 2021-03-26 23:46:57 +03:00
SergeyEzhin 1876de1e87 [mobile] Corrected About 2021-03-26 17:48:18 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 36e6394f2b [PE] Show version history 2021-03-24 10:39:09 +03:00
Julia Radzhabova 7311cd0c8c Refactoring open dialog 2021-03-23 16:55:20 +03:00
JuliaSvinareva 4b0ec3e352 [PE mobile] Add context menu 2021-03-23 14:05:45 +03:00
JuliaSvinareva 7fb9407ef6 [PE mobile] Add checking of hide insert comment, connecting comment components 2021-03-22 14:35:16 +03:00
Julia Radzhabova af181a55b2 Update translation 2021-03-19 22:18:18 +03:00
Julia Radzhabova 7c025d7967 Update translation 2021-03-19 22:08:12 +03:00
JuliaSvinareva f33112be3a [mobile] Fix icons 2021-03-19 13:53:33 +03:00
evgenykatyshev 5efce72104 Replace gray icons to black 2021-03-19 13:08:58 +03:00
Julia Radzhabova ea0e580b0b Merge branch 'release/v6.2.0' into develop 2021-03-19 12:36:49 +03:00
Julia Radzhabova 168a9f6024 Merge branch 'release/v6.2.0' into release/v6.3.0 2021-03-19 12:33:33 +03:00
SergeyEzhin 90b613d88d [mobile] Corrected some elements 2021-03-18 17:00:52 +03:00
Julia Radzhabova 916c911ac7 [Mobile] Use config permssions to view comments 2021-03-17 23:57:54 +03:00
SergeyEzhin 573d1c49c5 [mobile] Added About 2021-03-17 18:44:35 +03:00
Julia Radzhabova f35e929713 Add permissions for edit/remove comments 2021-03-17 12:02:06 +03:00
JuliaSvinareva 6f5f84a7aa Merge branch 'feature/mobile-apps-on-reactjs-pe' into feature/mobile-apps-on-reactjs 2021-03-16 20:20:54 +03:00
JuliaSvinareva 586dbd5449 Merge branch 'feature/mobile-apps-on-reactjs-de' into feature/mobile-apps-on-reactjs 2021-03-16 19:42:45 +03:00
SergeyEzhin 555e983bc3 [PE mobile] Small edits 2021-03-16 16:41:17 +03:00
SergeyEzhin 32f5bd693e [DE PE mobile] Correcting Find and Replace 2021-03-15 21:35:19 +03:00
SergeyEzhin 257c564d35 [PE mobile] Corrected stores according to mobx v. 6 and Slide Settings 2021-03-15 20:29:01 +03:00
Julia Radzhabova d8a5e8244a Update translation 2021-03-12 20:53:03 +03:00
Julia Radzhabova 3b673e6be4 Update translation 2021-03-12 20:27:25 +03:00
Maxim Kadushkin ecc19e0c62 [all] fix bug 49030 2021-03-12 00:16:19 +03:00
Maxim Kadushkin 3b40251853 [mobile] fill 'About' info in compile time 2021-03-11 10:21:22 +03:00
SergeyEzhin e47157f949 [PE mobile] Fixed Presentation Settings according to mobx v. 6 2021-03-10 21:46:18 +03:00
SergeyEzhin 5d06b05a51 Merge branch 'feature/mobile-apps-on-reactjs-de' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-de 2021-03-10 19:51:56 +03:00
SergeyEzhin de79f6e526 [PE mobile] Added Find and Replace 2021-03-10 19:51:22 +03:00
Maxim Kadushkin d3163b0be0 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de 
# Conflicts:
#	apps/common/mobile/resources/less/ios/icons.less
#	apps/common/mobile/resources/less/material/icons.less
 2021-03-10 10:41:56 +03:00
JuliaSvinareva 1c899fb7ed [DE PE mobile] Fix app options stores according to mobx v. 6 2021-03-09 18:05:16 +03:00
Julia Radzhabova 8974612ff4 Change api events: send onDocumentStateChange only after onDocumentReady, don't send false on loading. 2021-03-09 17:06:44 +03:00
JuliaSvinareva 48c50b145b [mobile] Make comment view from context menu 2021-03-08 21:30:42 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 1968bc470b Fix Bug 48962 2021-03-04 12:48:15 +03:00
SergeyEzhin c2ba15338c [PE mobile] Fixed Link Settings 2021-03-01 18:03:47 +03:00
SergeyEzhin 0a36021498 [PE mobile] Corrected Link Settings and Presentation Settings 2021-02-26 21:06:07 +03:00
Julia Radzhabova deae069826 Update translation 2021-02-26 17:53:24 +03:00
Julia Radzhabova 808a7ef142 [PE] Refactoring 2021-02-26 16:49:34 +03:00
Maxim Kadushkin b4814420f7 [all] fix skeleton stylesheets for IE 2021-02-22 17:23:58 +03:00
Maxim Kadushkin 78f9fa7637 [dark theme] support themes in loader 2021-02-22 16:58:25 +03:00
Maxim Kadushkin b07a01bb0f [all] hide "Dark theme" option from "View settings" menu 2021-02-21 21:40:41 +03:00
Julia Radzhabova 6205f6be76
Merge pull request #719 from ONLYOFFICE/feature/help-tips 
Feature/help tips
 2021-02-19 20:20:22 +03:00
Julia Radzhabova 3d088ba86b Fix translation 2021-02-19 20:06:36 +03:00
Julia Radzhabova 5c1b1185dd Delete dark theme tooltip 2021-02-19 20:00:35 +03:00
Julia Radzhabova 01b693f9c0 Update translation 2021-02-19 18:51:58 +03:00
Julia Radzhabova dcfed71c9b Update translation 2021-02-19 16:30:57 +03:00
Julia Radzhabova efa67ab226 Update help 2021-02-19 16:20:53 +03:00
Julia Radzhabova ba714c7007 Update translation 2021-02-19 14:01:26 +03:00
Julia Radzhabova 8b1fd47bba Update translation 2021-02-19 13:48:37 +03:00
Julia Radzhabova 10d0cb5c32 Update translation 2021-02-19 13:39:24 +03:00
Maxim Kadushkin 098ca4540f [PE] fixed scaled "reporter" window 2021-02-19 13:28:05 +03:00
Julia Radzhabova badb1c291b [Signature] Goto signature on context menu 2021-02-19 11:43:17 +03:00
Semyon Bezrukov bf7eb0dd30
Fix beta hint typo (#715) 2021-02-18 17:55:53 +03:00
Julia Radzhabova 1bed0d1bf4 Add api parameter customization.hideStartTips: hide theme tooltip 2021-02-17 22:09:50 +03:00
Julia Radzhabova 1dff1aaae3 Show tooltips with dark theme description 2021-02-17 21:11:04 +03:00
Julia Radzhabova 17a1ec78e4 Change synchronize tip component: add new placements 2021-02-17 20:25:30 +03:00
Maxim Kadushkin 64dfc35569 [all] fix bug 448774 2021-02-17 19:00:28 +03:00
Julia Radzhabova 756d638043 Fix layout for IE 2021-02-16 17:53:01 +03:00
Julia Radzhabova 41a907f48d [PE][PE mobile] Bug 46911 2021-02-16 17:05:47 +03:00
Julia Radzhabova 7bca00ebc5 Merge branch 'develop' into feature/pe-slide-size 2021-02-16 15:28:45 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +03:00
Maxim Kadushkin 8847c328a6 [dark theme] fix PE styles for IE 2021-02-16 11:36:00 +03:00
Julia Radzhabova 36856e2e20 [PE][PE mobile] Get/set slide size in emu 2021-02-15 20:10:46 +03:00
JuliaSvinareva 0b4deb6e01 [PE mobile] Fixed - gateway is undefined 2021-02-15 16:36:30 +03:00
Maxim Kadushkin 436e232b2e [all] refactoring 2021-02-14 00:44:12 +03:00
Maxim Kadushkin db3a344760 [all] added "dark theme" item in button "Options" 2021-02-14 00:43:51 +03:00
Maxim Kadushkin c7e6a7a316 [all] fix compiled app launch 2021-02-13 13:05:16 +03:00
Julia Radzhabova f3bf733cf6
Merge pull request #707 from ONLYOFFICE/feature/new-chart-types 
Feature/new chart types
 2021-02-13 12:55:59 +03:00
Maxim Kadushkin 8ae4d58b96 [all] fix compiled app launch 2021-02-12 23:51:01 +03:00
Julia Radzhabova 0e5e7f81e2 Update translation 2021-02-12 17:59:34 +03:00
Julia Radzhabova fb8a6f1a98
Merge pull request #704 from ONLYOFFICE/feature/hide-rulers 
Add hideRulers parameter to customization
 2021-02-12 14:39:24 +03:00
Julia Radzhabova e19775972a Update ios device detection 2021-02-12 12:16:16 +03:00
Maxim Kadushkin e641628a63 [all] refactoring 2021-02-12 12:08:53 +03:00
Maxim Kadushkin 3636bf78c4 [all] fix for device scaling checking 2021-02-12 12:08:33 +03:00
JuliaSvinareva c3437aa762 [DE mobile] Add review settings 2021-02-12 02:34:01 +03:00
Julia Radzhabova 1de1fd9963 Add hideRulers parameter to customization 2021-02-11 20:13:47 +03:00
Julia Radzhabova 8dfd43ec0e Change api parameter reviewGroups 2021-02-11 19:26:06 +03:00
Julia Radzhabova 47f079dcb3 Merge branch 'develop' into feature/new-chart-types 2021-02-11 17:22:09 +03:00
Julia Radzhabova 348a771171 Refactoring editors loading 2021-02-11 15:52:38 +03:00
Maxim Kadushkin 5330e3a3c8 [all] skeleton support for 150% 2021-02-10 23:42:55 +03:00
Julia Radzhabova 7a62278eb9 Update translation 2021-02-10 18:15:56 +03:00
Maxim Kadushkin f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5 
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
 2021-02-10 15:40:30 +03:00
JuliaSvinareva 9444e39ff0 [PE mobile] Removed duplicate code 2021-02-09 19:07:43 +03:00
JuliaSvinareva 3912fe4620 [mobile] Edit collaboration 2021-02-08 19:32:25 +03:00
Maxim Kadushkin 3f228da263 [stylesheets] refactoring 2021-02-07 00:30:24 +03:00
Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table 
# Conflicts:
#	apps/common/main/resources/less/loadmask.less
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/FileMenuPanels.js
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/presentationeditor/main/app/controller/RightMenu.js
#	apps/presentationeditor/main/app/view/FileMenuPanels.js
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
 2021-02-06 14:42:56 +03:00
Maxim Kadushkin 1cd0586ed6 [dark theme] changed script for deployment 2021-02-06 13:08:20 +03:00
Maxim Kadushkin 900a179f7e [dark theme] added ui themes switcher 2021-02-06 13:06:33 +03:00
Maxim Kadushkin f938e668ef [dark theme] added 'Themes' controller 2021-02-06 13:03:46 +03:00
Maxim Kadushkin c879fa6c80 [dark theme] changed storage key name 2021-02-06 12:55:47 +03:00
Julia Radzhabova a79e733de4 Update translation 2021-02-05 16:34:50 +03:00
Julia Radzhabova 57b1ff417d Update help 2021-02-05 16:07:35 +03:00
Julia Radzhabova 6d02752fce Update translation 2021-02-05 14:56:57 +03:00
Julia Radzhabova f17b8d1c76 Change review permissions: deprecate customization.reviewPermissions parameter. Use permissions.reviewGroup instead: list of groups, that current user can accept/reject. 2021-02-05 13:51:37 +03:00
Julia Radzhabova 310c00b245 Deprecate api parameters: document.info.author, document.info.created. Use document.info.owner and document.info.uploaded instead. 2021-02-04 16:05:49 +03:00
Julia Radzhabova e11756cbde [PE mobile] Fix Bug 48566, Fix Bug 48567 2021-02-04 14:20:15 +03:00
Julia Radzhabova 60cbd47725 Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true). 
Deprecate customization.commentAuthorOnly parameter.
 2021-02-04 12:39:56 +03:00
JuliaSvinareva 4f3bf2729c Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' into feature/mobile-apps-on-reactjs 2021-02-03 23:56:08 +03:00
SergeyEzhin db792535cc [PE mobile] Added another edit to Link Settings 2021-02-03 20:50:23 +03:00
Julia Radzhabova b72744ef47 FIx Bug 48553 2021-02-03 16:56:01 +03:00