Commit graph

126 commits

Author SHA1 Message Date
Julia Radzhabova da9482c62b Merge branch 'hotfix/v5.6.0' into release/v6.0.0 2020-07-28 21:54:39 +03:00
Maxim Kadushkin 7a768c8678 [all] 'Header' markup changed, added 'crypted' icon 2020-06-08 14:02:48 +03:00
JuliaSvinareva af9eb000d9 [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
Maxim Kadushkin 2400e764e6 [all] debug for insert chart 2020-04-29 11:01:24 +03:00
Maxim Kadushkin 6a7c2316cc [all] debug 2020-04-27 19:12:08 +03:00
Maxim Kadushkin 9abf2c60db [all] fix bug 44742 2020-04-25 00:58:40 +03:00
Maxim Kadushkin 0d719d810d fix bug 45259 2020-04-22 19:46:53 +03:00
Julia Radzhabova fbee9a5103 [DE] Don't hide sharing settings for review only mode (#318) 2020-01-28 15:50:16 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Maxim Kadushkin 7e9a81f1ab [all] renamed icon 2019-12-02 19:21:39 +03:00
Julia Radzhabova 74be025210
Merge pull request #274 from ONLYOFFICE/feature/svg-icons
Feature/svg icons
2019-11-29 14:19:42 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 019dffbceb Add event onRequestSharingSettings: use instead editorConfig.sharingSettingsUrl. 2019-11-28 16:54:14 +03:00
Maxim Kadushkin ecfad7b0c9 [all] header svg icons go to png 2019-11-27 19:48:03 +03:00
Maxim Kadushkin 699f22d8b6 [all] header svg icons go to png 2019-11-27 19:47:04 +03:00
Maxim Kadushkin a72d14d421 [desktop] send 'save' button changed icon 2019-11-05 15:28:33 +03:00
Julia Radzhabova 2fb50a64ae Refactoring 2019-10-31 12:57:37 +03:00
Julia Radzhabova 611c12e885 Refactoring change access rights. Fix Bug 43103, Bug 43105 2019-10-09 13:23:40 +03:00
Maxim Kadushkin 1407e01f4c Merge branch 'develop' into feature/svg-icons
# Conflicts:
#	apps/documenteditor/main/index.html
2019-10-07 16:55:17 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 7c8150ca16 Fix Bug 42607 2019-08-29 12:46:42 +03:00
Maxim Kadushkin ef0efaf919 [common] refactoring for 'Header' view 2019-08-22 17:33:13 +03:00
Maxim Kadushkin cc7b8102ca Merge branch 'release/v5.3.0' into develop
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
2019-05-22 16:02:54 +03:00
Maxim Kadushkin 126cf552df [all] added 'Undock' button 2019-05-13 14:45:17 +03:00
Julia Radzhabova ca18865431 Fix Bug 41367 2019-04-23 13:20:39 +03:00
Julia Radzhabova 3adde58fde Fix Bug 41097 2019-04-08 18:40:08 +03:00
Maxim Kadushkin 30dc3098b4 [build] apply tags to vary production info 2019-02-22 15:52:33 +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 faf3cceeea Merge branch 'hotfix/v5.2.7' into develop 2019-01-15 15:18:47 +03:00
Julia Radzhabova d06e19d543 Merge branch 'feature/desktop-header-view' into develop 2019-01-14 17:01:46 +03:00
Julia Radzhabova 54ef4fba40 Fix bugs 2019-01-11 14:02:28 +03:00
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Julia Radzhabova 524eaa94f2 Fix Bug 39696 2018-11-13 11:40:35 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 48fa05b250 For Bug 38948: disable print button on start in the desktop header 2018-09-25 17:09:59 +03:00
Julia Radzhabova 88998b07aa Set header layout as in the desktop editors 2018-09-25 13:46:28 +03:00
Julia Radzhabova 87feed6ccf Hide settings menu in the header when open change access window 2018-08-28 15:09:19 +03:00
Julia Radzhabova 4e033860cf Fix loading on IE10 2018-07-30 17:08:33 +03:00
Julia Radzhabova 6b4261629f [DE] Add mode for filling forms 2018-07-19 17:47:03 +03:00
Maxim Kadushkin af8edb29ca merge with develop 2018-07-18 15:24:51 +03:00
Julia Radzhabova 8212070fa3 Header: show editing users in format <username>(<opened browser tabs>) 2018-06-05 11:54:49 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Julia Radzhabova b9f8990fee Fix Bug 37531 2018-04-20 11:23:58 +03:00
Maxim Kadushkin e7cfb6909b [SSE] button "settings" stayed disabled for some actions 2018-04-18 15:30:09 +03:00
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Maxim Kadushkin 59b6193f24 [DE] refactoring 2018-03-28 13:37:41 +03:00
Julia Radzhabova 89cf77c172 Customization goback parameter doesn't depend of license. 2018-03-23 16:00:57 +03:00