Commit graph

51 commits

Author SHA1 Message Date
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Julia Radzhabova 3984fda98d Fix Bug 51460 2021-07-22 17:13:59 +03:00
Julia Radzhabova b1534675c4 For Bug 42150 2021-07-12 11:12:02 +03:00
Julia Radzhabova cc271cd723 Bug 42150: add sort direction 2021-07-12 00:30:52 +03:00
Julia Radzhabova defc1d8c8b Change sorting icons 2021-07-08 19:27:03 +03:00
Julia Radzhabova 91c9872ffc Add close comments button. Layout refactoring 2021-07-07 01:51:19 +03:00
Julia Radzhabova f1f835066e Change icon 2021-07-07 01:25:56 +03:00
Julia Radzhabova 0bcce8991c Comments refactoring 2021-07-06 23:24:44 +03:00
Julia Radzhabova 79dbe85bdf Sort comments by date and author 2021-07-06 22:58:36 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova b354296c71 Fix Bug 49936 (fix rev.6d121415f237d096a3fe7354068c0d25f8622956) 2021-04-25 00:12:37 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 525a0a4aec Fix Bug 47533 2020-11-18 15:28:47 +03:00
Julia Radzhabova e222fdf4a7 Add parameter to api config: customization.reviewPermissions (user name must be prefixed) 2020-08-04 22:20:20 +03:00
Julia Radzhabova 974c512765 Add parameter compatibleFeatures to customization: hide ability to add comment to document 2019-11-01 10:36:21 +03:00
Julia Radzhabova d5b88f5e9c Fix Bug 43112 2019-10-08 17:43:24 +03:00
Julia Radzhabova 42442604a8 Fix rev.537d84cbcc412817941ca58f25839b92171316c2 (reply or edit comments to document) 2019-10-08 13:54:20 +03:00
Julia Radzhabova 13aef92894 Fix Bug 42962 2019-09-29 13:22:16 +03:00
Maxim Kadushkin 537d84cbcc [common] refactoring Comments view 2019-07-29 18:32:32 +03:00
Julia Radzhabova c9dbd128e8 [Comments] Use original guid for comment mentions 2019-07-16 15:50:55 +03:00
Julia Radzhabova bd6071ccd2 Merge branch 'feature/comment-mentions' into develop 2019-07-12 17:00:29 +03:00
Julia Radzhabova f19597a9cb Mentions refactoring: add placeholder to comment textarea, set mentions on adding reply, clear external users when change document access rights 2019-06-26 14:04:02 +03:00
Julia Radzhabova 25e50435bb Request users for mentions, send mentions 2019-04-23 14:41:35 +03:00
Julia Radzhabova 58a1ddb834 Find emails for sending invitation (begins with + or @) when adding comment. 2019-04-18 17:06:46 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00
Alexander.Trofimov 68a1691d28 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 16:00:34 +03:00
Alexander.Trofimov 1c9e684698 [copyright] Update Copyright
2018 -> 2019
2019-01-17 15:58:05 +03:00
Julia Radzhabova 61ce51f6a1 View comments in final/original display mode (don't disable left comments panel) 2019-01-14 16:51:23 +03:00
Julia Radzhabova f621e671eb Show comments in view mode (hints, left panel, advanced settings in the File menu) 2018-12-17 11:37:43 +03:00
Julia Radzhabova dbdf13f1a1 Show comments and review changes in the same window 2018-06-07 17:09:54 +03:00
Julia Radzhabova 71997cf64e Draw user color in comments, chat, review changes. 2018-06-04 14:45:22 +03:00
Julia Radzhabova 0523524829 Fix Bug 37570 2018-05-17 17:34:04 +03:00
Julia Radzhabova 0af418dced revert commit 161bd0ee3d (Bug 35896) 2018-05-08 11:07:01 +03:00
Julia Radzhabova f11f79b1b9 Fix Bug 37291 2018-03-23 17:15:42 +03:00
Julia Radzhabova bbc6417a4d Fix Bug 37106 (appeared due to Bug 35896). 2018-03-05 16:28:53 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 814c68c7ce Fix Bug 36666. 2018-01-15 11:20:43 +03:00
Julia Radzhabova 161bd0ee3d Fix Bug 35896. 2017-09-28 14:02:33 +03:00
Julia Radzhabova 8512f5061b Fix Bug 35787. 2017-09-08 14:25:25 +03:00
Julia Radzhabova 43cf61dc71 Fix Bug 35408. 2017-08-14 14:46:18 +03:00
Julia Radzhabova bd5ae6e902 Update hint for Add Comment button. 2017-08-02 16:47:40 +03:00
Julia Radzhabova c0491e3181 [Comments] Hide tooltip on resolve button when option "show resolved comments" is off. 2017-07-05 15:37:07 +03:00
Julia Radzhabova 96712db8cb Update for underscore 1.8.3. 2017-04-21 11:10:07 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova 860a8114ec Fix Bug 33354. 2016-11-07 11:45:15 +03:00
Julia Radzhabova ccded15130 Fix Bug 32934. 2016-08-09 11:50:51 +03:00
Julia Radzhabova d032cbdd9e fix bug 32494. 2016-07-25 16:10:16 +03:00
Alexander.Trofimov eec1f68457 use 'c_oAsc...' variables from Asc namespace 2016-04-05 14:52:34 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00