Commit graph

185 commits

Author SHA1 Message Date
Julia Radzhabova cb61ccb5f3 [DE] Fix Bug 46725 2020-10-15 17:14:06 +03:00
Julia Radzhabova b9ce71728c Merge branch 'develop' into feature/sse-views 2020-09-14 14:06:03 +03:00
Maxim Kadushkin aa0242e16d [desktop] cut unused code 2020-09-04 20:23:57 +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
Maxim Kadushkin ad72a25750 [common] header's refactoring 2020-07-29 23:14:11 +03:00
Maxim Kadushkin 6c26ab0c1b [common] removed 'undock' button from header 2020-07-29 23:06:01 +03:00
Maxim Kadushkin e37deabb02 [common] debug centering for doc title 2020-07-29 22:50:07 +03:00
Maxim Kadushkin cc0a57f60a [all] centered doc title depending editor width 2020-07-28 23:24:51 +03:00
Julia Radzhabova da9482c62b Merge branch 'hotfix/v5.6.0' into release/v6.0.0 2020-07-28 21:54:39 +03:00
Julia Radzhabova 1f49644924 [SSE] Lock view settings 2020-07-10 16:19:07 +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
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin a2afa4b7fe [Common] added 'settings' button 2018-03-21 14:11:03 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 3e60e495a0 Merge branch 'develop' into feature/svg-icons 2018-03-04 23:49:46 +03:00
Julia Radzhabova 1b75d2035e [Common] Bug in rendering chat and header panel when user id contains special characters. 2018-03-02 17:48:24 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 19b0d19792 [common] centered document title 2018-02-28 16:31:59 +03:00
Maxim Kadushkin 9dcf65d8df [common] added coauth icons to header's 'save' button 2018-02-28 16:24:48 +03:00
Maxim Kadushkin 39f29c5ef8 [common] lock/unlock header buttons on file menu events 2018-02-23 00:19:40 +03:00
Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
2018-02-22 02:41:49 +03:00
Maxim Kadushkin 6d385730b1 [Common] make created buttons disabled 2018-02-16 02:46:45 +03:00
Julia Radzhabova f3c3ead61c Fix Bug 36883. 2018-02-14 17:11:28 +03:00
Julia Radzhabova 104ce55de4 [Common] Refactoring 2018-02-13 17:52:06 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +03:00
Julia Radzhabova a1db2fac69 Fix Bug 36868. 2018-02-07 13:57:46 +03:00
Maxim Kadushkin 159b26aac5 fix bug 36857 2018-02-07 11:11:58 +03:00
Maxim Kadushkin f328e83a4f refactoring 2018-02-03 16:10:38 +03:00
Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/common/main/lib/util/utils.js
2018-02-02 16:18:07 +03:00
Maxim Kadushkin e2f86ace35 in button added icon for 150% of zoom 2018-02-01 17:15:56 +03:00
Julia Radzhabova bb36c63c13 [DE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 13:57:58 +03:00
Maxim Kadushkin 826ac6aef1 new design changes 2018-01-23 20:35:16 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 73f5efae27 Merge branch 'release/v5.0.0' into develop 2017-09-19 17:44:29 +03:00
Julia Radzhabova 876171af9c Change click on header logo: click only on the image. 2017-09-19 15:42:44 +03:00
Julia Radzhabova 405fe55461 Open "customization->logo->url" when click on the header logo. 2017-09-19 12:16:59 +03:00
Julia Radzhabova cdf53c398c Fix Bug 35860. 2017-09-18 15:13:36 +03:00
Julia Radzhabova f5a3a86ba0 Fix Bug 35860. 2017-09-18 14:38:24 +03:00
Julia Radzhabova fe462bd08b Merge pull request #3 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-30 15:07:13 +03:00
Julia Radzhabova 220b4b8c0e Fix Bug 35721. 2017-08-24 11:44:11 +03:00
Julia Radzhabova 8c7287def2 Merge pull request #1 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-22 14:08:09 +03:00
Julia Radzhabova b6b818db80 Fix Bug 35662. 2017-08-21 10:53:39 +03:00
Julia Radzhabova 8900b912d7 User icon isn't displayed in FF, Safari on retina. 2017-08-17 17:32:37 +03:00
Julia Radzhabova 4f37e52b8c Fix Bug 35626. refactoring rev. 1843040605. 2017-08-17 16:44:57 +03:00
Julia Radzhabova 1843040605 Fix Bug 35626. 2017-08-17 15:39:28 +03:00
Maxim Kadushkin 891a4dc91f [Common] locked click on branding logo 2017-08-15 19:30:16 +03:00
Maxim Kadushkin 0bb1d90bb3 [Common] rename document in title 2017-08-15 14:44:59 +03:00
Julia Radzhabova 948bb630bf Change hint for printing from toolbar in the view mode. 2017-08-14 14:27:36 +03:00
Julia Radzhabova 1587ae9f2d Fix Bug 35539 + Hide context menu on document caption. 2017-08-08 11:17:18 +03:00
Julia Radzhabova 919cd331d5 Fix bug in viewer. 2017-08-07 17:10:03 +03:00
Maxim Kadushkin cb5e41fa78 [Common] setCanRename caused a error before doc name label wasn't created 2017-08-02 14:52:52 +03:00
Maxim Kadushkin 8513705b1e [Common] added 'document rename' 2017-08-01 15:14:19 +03:00