Commit graph

7096 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 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
Julia Radzhabova 9a8db1b3b8 Disable resolve button 2021-04-07 22:50:53 +03:00
Julia Radzhabova c57b6f1367 Update icons 2021-04-07 22:41:56 +03:00
Julia Radzhabova 1bd7203489 Move UserInfoParser to sdkjs 2021-04-07 18:04:54 +03:00
Maxim Kadushkin 2c0696ed12 Merge branch 'release/v6.3.0' into develop 2021-04-06 14:44:41 +03:00
maxkadushkin 1637bd64c4
Merge pull request #790 from ONLYOFFICE/feature/pr11-send-sdk-colors
Feature/pr11 send sdk colors
2021-04-06 12:00:19 +03:00
Julia Radzhabova 33acee7d61 Resolve all comments 2021-04-06 10:53:53 +03:00
Maxim Kadushkin ae201c5b0b [common] send theme's colors array to sdk 2021-04-06 10:31:32 +03:00
Maxim Kadushkin a1100cfa8d [common] fix color value 2021-04-06 10:29:39 +03:00
Julia Radzhabova f33f7c28e9 [SSE] Show active cell when import from text/csv 2021-04-05 18:48:10 +03:00
maxkadushkin ca7a76b8fc
Merge pull request #789 from ONLYOFFICE/fix/reporter
Fix/reporter
2021-04-05 18:35:19 +03:00
maxkadushkin 148355b9cd
Merge pull request #786 from ONLYOFFICE/feature/assets-update
Change icons color to black in document editor
2021-04-05 18:28:20 +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 fc2bcf24bd [PE][SSE] Add api parameters for co-authoring mode 2021-04-02 22:36:08 +03:00
Julia Radzhabova c9b200ec9e Fix alert window with 'don't show' option 2021-04-02 20:03:13 +03:00
Julia Radzhabova 630c01105c Merge branch 'release/v6.3.0' into develop 2021-04-02 17:33:33 +03:00
evgenykatyshev d6cecadb1f Change icons color to black in document editor 2021-04-02 17:29:04 +03:00
Julia Radzhabova 192995c854
Merge pull request #785 from ONLYOFFICE/fix/bugfix
Fix/bugfix
2021-04-02 16:48:11 +03:00
Julia Radzhabova 0a301cb9f7 [SSE] Fix Bug 49442 2021-04-02 16:45:04 +03:00
Julia Radzhabova a59baff0bb Fix combobox style 2021-04-02 16:35:07 +03:00
Julia Radzhabova cde835d113
Merge pull request #784 from ONLYOFFICE/fix/fix-styles
For Bug 49351
2021-04-02 15:26:41 +03:00
Julia Radzhabova 72bb44c3bd For Bug 49351 2021-04-02 15:23:05 +03:00
maxkadushkin f35bd800af
Merge pull request #783 from ONLYOFFICE/feature/assets-update
Fix icon size
2021-04-02 15:14:52 +03:00
evgenykatyshev 9c2e9086b2 Fix icon size 2021-04-02 14:52:11 +03:00
Julia Radzhabova 6f9df65a46
Merge pull request #782 from ONLYOFFICE/fix/bugfix
For Bug 49351
2021-04-02 14:16:40 +03:00
Julia Radzhabova 682571b930
Merge pull request #781 from ONLYOFFICE/feature/assets-update
Update icon form-submit
2021-04-02 14:14:18 +03:00
Julia Radzhabova 0ef3a22a5e For Bug 49351 2021-04-02 14:13:37 +03:00
evgenykatyshev 01ef584511 Update icon form-submit 2021-04-02 14:10:20 +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 8da58d6e32
Merge pull request #780 from ONLYOFFICE/fix/bugfix
[DE] Fix change level list
2021-04-02 12:33:02 +03:00
Julia Radzhabova b85cd8c195 [DE] Fix change level list 2021-04-02 12:28:07 +03:00
Maxim Kadushkin bca6099e18 [common] skip theme's colors updatre for IE 2021-04-02 12:22:17 +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 74bbb60787
Merge pull request #778 from ONLYOFFICE/fix/translation
Update translation
2021-04-02 11:43:51 +03:00
Julia Radzhabova 30e02a93fc Update translation 2021-04-02 11:39:51 +03:00
Julia Radzhabova ff6ed83339 Move changeCoAuthoring parameter to permissions 2021-04-02 11:08:36 +03:00
Maxim Kadushkin 4bcdf7d071 [dark theme] fix bug 49276 2021-04-02 00:02:47 +03:00
Maxim Kadushkin d016f27098 [all] changed icon name 2021-04-02 00:02:05 +03:00
evgenykatyshev 521e1c982e Add 1.5x sprite for bullets and numbering
Also update 1x and 2x sprites
2021-04-01 21:17:43 +03:00
evgenykatyshev cd69ee0d02 Change icons color to black
One more attempt
2021-04-01 20:41:08 +03:00
Julia Radzhabova 1080195172 Update merge icons 2021-04-01 17:10:47 +03:00
Julia Radzhabova 1e632df252
Merge pull request #776 from ONLYOFFICE/feature/sse-sparkline
Feature/sse sparkline
2021-04-01 13:45:46 +03:00
Julia Radzhabova 06e44a34b6 [SSE] Add translation 2021-04-01 13:41:23 +03:00
Julia Radzhabova 553b2daffc [DE] Add api parameters for co-authoring mode 2021-04-01 13:36:08 +03:00