Commit graph

1846 commits

Author SHA1 Message Date
Julia Radzhabova 08e3e47fa1 Merge branch 'hotfix/v5.3.2' into develop 2019-06-21 18:28:46 +03:00
Julia Radzhabova cd8e7c9023 Merge branch 'feature/doc-info' into develop 2019-06-21 17:27:49 +03:00
Julia Radzhabova 59edd743d2 Update document info when accept changes 2019-06-21 17:17:02 +03:00
Julia Radzhabova 1f31531816 Bug fixed: text is entered into the canvas when the info field lost focus 2019-06-21 17:15:40 +03:00
Julia Radzhabova 244edfe69a Document info: undo changes by Esc button 2019-06-21 16:35:23 +03:00
Julia Radzhabova e6fb81e205 Refactoring documnt info changing 2019-06-21 15:37:11 +03:00
Julia Radzhabova d7abed8f38 [DE] Lock document info settings 2019-06-21 15:14:24 +03:00
Julia Radzhabova aa9c0a2f5c Apply document info (subject, title, comment, authors) 2019-06-21 14:34:40 +03:00
Julia Radzhabova 15aac51ab4 Menu component: refactoring, adjust menu to browser height 2019-06-21 10:46:00 +03:00
Julia Radzhabova 20a45dda5f Menu component: change scroll 2019-06-20 14:32:10 +03:00
Julia Radzhabova 51468ed66e [DE] Update translation 2019-06-19 11:35:11 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 62dbe2e80d [DE] Watermark: disable Ok button when image is not loaded 2019-06-19 11:22:10 +03:00
Julia Svinareva b541c0ddbf [SSE mobile] Fix bug 34113; Add Filter Options: Clear, Delete Filter, Selection Of Values 2019-06-19 09:48:37 +03:00
Julia Radzhabova 3113e79881 [DE] Add translation for watermark 2019-06-18 16:26:08 +03:00
Julia Radzhabova 45a82b8442 [DE] Watermark: save language settings 2019-06-18 16:20:52 +03:00
Julia Radzhabova 1fcc5190e5 [DE] Change watermark button 2019-06-18 12:35:01 +03:00
Julia Radzhabova 23c85be00e [DE] Refactoring watermark settings 2019-06-18 12:22:24 +03:00
Julia Radzhabova 4ac3503435 [DE] Get/put watermark settings 2019-06-17 17:05:27 +03:00
Julia Radzhabova be8a06d16b Change compactHeader, toolbarNoTabs customization parameters (#190) 2019-06-17 12:48:34 +03:00
Julia Radzhabova 468ed1ef84 Fix Bug 40504 2019-06-14 10:53:20 +03:00
Julia Radzhabova 34950ab65c Merge branch 'feature/mobile-settings' into develop 2019-06-13 11:47:12 +03:00
Julia Svinareva 23eab461e0 Add translations 2019-06-13 11:23:37 +03:00
Alexander.Trofimov 8ce8178389 [de] Refactorig
Delete asc_CChartStyle. Use CStyleImage. asc_getImageUrl -> asc_getImage, asc_getStyle -> asc_getName
2019-06-11 18:23:43 +03:00
Julia Radzhabova 94e17d2d3a
Merge pull request #186 from ONLYOFFICE/feature/buttons-set
Feature/buttons set
2019-06-11 17:15:20 +03:00
Julia Radzhabova 83594a45ee Update icons 2019-06-11 15:15:27 +03:00
Julia Radzhabova 4321974f75 Use ButtonsArray for group of buttons 2019-06-11 14:27:25 +03:00
Julia Radzhabova e347b92a0f Use ButtonsArray for group of buttons 2019-06-11 10:52:13 +03:00
Julia Radzhabova 756a02cfb9 Merge branch 'develop' into feature/buttons-set 2019-06-10 17:53:29 +03:00
Julia Radzhabova 2e87bd7afa [DE][PE] Add tooltips for table styles 2019-06-10 16:01:10 +03:00
Julia Radzhabova 863e500d67 Refactoring buttons render 2019-06-10 13:45:38 +03:00
Maxim Kadushkin f5d06e4012 [mobile] debug for vary production 2019-06-10 11:56:27 +03:00
Alexander.Trofimov 964220a560 [de][pe] Refactoring
Table get_Image -> asc_getImage, get_Id -> asc_getId
2019-06-07 18:07:49 +03:00
Maxim Kadushkin 9a18869d62 refactoring 2019-06-07 17:08:17 +03:00
Maxim Kadushkin c9399b90ae [all] extend production tags 2019-06-07 16:49:13 +03:00
Maxim Kadushkin 8b06eb1461 [DE] refactoring 2019-06-07 16:48:27 +03:00
Maxim Kadushkin 8ee39e65f9 [build] debug 2019-06-07 16:47:41 +03:00
Maxim Kadushkin fb2ec72712 [build] apply tags to vary production info 2019-06-07 16:34:54 +03:00
Julia Radzhabova 70654ad700 Fix bug with multi-gradient 2019-06-07 14:15:15 +03:00
Julia Svinareva 5a009e4c90 [DE mobile] [PE mobile] [SSE mobile] Hide Collaboration when no edit users 2019-06-07 10:29:43 +03:00
Julia Radzhabova e02ef3e65f [DE] Bug 40719: textart settings. 2019-06-06 17:20:05 +03:00
Julia Radzhabova 5fe0c2027c [DE] Bug 40719: thumbs count in slider > 2. Change shape settings for multi-gradient. 2019-06-06 15:03:38 +03:00
Julia Svinareva 4841a1628b [DE mobile] Fix review 2019-06-05 17:16:41 +03:00
Julia Svinareva 5e840f12c1 [DE mobile] [PE mobile] [SSE mobile] Add disabled Collaboration 2019-06-05 17:15:24 +03:00
Julia Radzhabova 2303266c74
Merge pull request #180 from ONLYOFFICE/feature/sse-data-tab
Feature/sse data tab
2019-06-05 15:38:45 +03:00
Julia Svinareva 739bfb5471 [DE mobile] [PE mobile] [SSE mobile] Display Collaboration in view mode 2019-06-04 17:59:42 +03:00
Julia Svinareva 4fb6e2abbf [DE mobile] [PE mobile] Fix user output order 2019-06-04 15:59:25 +03:00
Julia Svinareva d5b432d950 [DE mobile] [PE mobile] Fix less 2019-06-04 09:48:26 +03:00
Julia Svinareva 783ec39e1a [PE mobile] Add Collaboration, add Edit Users, fix less 2019-05-31 19:18:14 +03:00
Julia Svinareva 95675576eb [DE mobile] Add icon for Application Settings 2019-05-31 16:43:33 +03:00
Julia Svinareva ff25393019 [DE mobile] Add icons for Collaboration 2019-05-31 16:28:17 +03:00
Julia Svinareva 8abb5fde97 [DE mobile] Refactoring Edit Users 2019-05-31 15:42:36 +03:00
Julia Radzhabova 1d764d7d25 Fix translation
https://github.com/ONLYOFFICE/DocumentServer/issues/577
2019-05-31 10:13:59 +03:00
Julia Radzhabova 2c1e8da0b2 Merge branch 'develop' into feature/sse-data-tab 2019-05-30 16:15:48 +03:00
Julia Svinareva 0983f77969 [DE mobile] Add initials for users 2019-05-30 14:28:56 +03:00
Julia Svinareva d3551bb26a [DE mobile] Fix display only edit users 2019-05-29 19:13:00 +03:00
Julia Radzhabova 42391fdea4 Refactoring toolbar lock 2019-05-29 16:49:52 +03:00
Julia Radzhabova fe5de5b3e6 Fix loading 2019-05-29 16:21:03 +03:00
Julia Radzhabova f4a74837cd Merge branch 'feature/bugfix' into develop 2019-05-29 13:35:02 +03:00
Julia Radzhabova 55ee9ef2cc
Merge pull request #176 from ONLYOFFICE/feature/Bug31297
Feature/bug31297
2019-05-29 13:30:37 +03:00
Julia Radzhabova 2075a43a01 [DE mobile] Fix translation 2019-05-29 12:05:46 +03:00
Julia Svinareva 193835e142 [DE mobile] Add Edit Users into Collaboration 2019-05-28 17:44:24 +03:00
Julia Radzhabova 24ecdef872 [SSE] Add translation for header/footer settings 2019-05-28 13:00:42 +03:00
Julia Radzhabova eae18e94b0 Merge feature/sse-header-footer into develop 2019-05-28 12:42:45 +03:00
Alexey Golubev 437fe374c0 v5.3.0 2019-05-27 17:21:46 +03:00
Julia Svinareva 57aaf4c073 [DE mobile] Add Review Change in context menu 2019-05-24 11:43:15 +03:00
Julia Svinareva 0e341287a1 [DE mobile] Fix Collaboration template 2019-05-24 11:06:14 +03:00
Julia Svinareva ec40be85d1 [DE mobile] Move Collaboration 2019-05-24 11:04:39 +03:00
Julia Radzhabova 2e16e770e8 Customization plugins refactoring 2019-05-23 17:25:44 +03:00
Julia Svinareva 40dfd20cdf [DE mobile] Remove delete other people's reviews button in isReviewOnly mode 2019-05-23 16:37:05 +03:00
Julia Radzhabova 6f9546ca38 Update translation 2019-05-23 15:35:09 +03:00
Julia Radzhabova e432b869b5 Update translation 2019-05-23 15:33:28 +03:00
Julia Svinareva 6d5ba32b87 [DE mobile] Add translate 2019-05-23 14:53:46 +03:00
Julia Svinareva 6d32ad8e6b [DE mobile] Add Move to Review 2019-05-23 14:49:53 +03:00
Julia Svinareva fa658a11cd [DE mobile] Fix template 2019-05-23 12:29:30 +03:00
alexandervnuchkov 085af93d61 [DE] Removed duplicate entry in help menu 2019-05-23 12:24:57 +03:00
Julia Radzhabova bf8dafb914 Merge feature/mobile-settings to develop 2019-05-23 11:37:12 +03:00
Julia Svinareva 2a13d1be07 [DE mobile] Fix translate 2019-05-22 16:19:22 +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
Julia Svinareva dc6402c41a [DE mobile] Add Collaboration icon into toolbar, fix less 2019-05-22 15:36:43 +03:00
Julia Radzhabova 06d71b464b Fix loading plugins 2019-05-22 14:44:30 +03:00
Julia Svinareva ee7f41196b [DE mobile] Add translate 2019-05-22 12:45:38 +03:00
Julia Svinareva 840bd61c4b [DE mobile] Remove animation when review open 2019-05-22 11:44:45 +03:00
Julia Svinareva 88ee14544c [DE mobile] Change review 2019-05-22 10:20:49 +03:00
Julia Svinareva 6f0c48fc5e [DE mobile] Add check canReview 2019-05-22 09:59:21 +03:00
Julia Svinareva 0d74c6d334 [DE mobile] Review: add delete current change in review mode and fix update description current change. 2019-05-21 17:43:42 +03:00
Julia Radzhabova 2d8059a61d Plugins refactoring 2019-05-21 13:02:55 +03:00
Julia Svinareva 3eb99a778a [DE mobile] Fix text 2019-05-21 11:02:03 +03:00
Julia Svinareva 039d15c233 [DE mobile] Fix disabled settings when change Display Mode 2019-05-21 11:00:00 +03:00
Julia Svinareva a0337e4302 [DE mobile] Add button exit modal window, delete track changes from settings. 2019-05-17 18:56:58 +03:00
Julia Svinareva 4f9d1e85f3 [DE mobile] Add styles collaboration. 2019-05-17 17:18:56 +03:00
Julia Svinareva 1723da3324 [DE mobile] Add check for mode = review into collaboration settings 2019-05-17 15:00:52 +03:00
Julia Radzhabova 69c9cc3dab Merge branch 'feature/async-xhr' into develop 2019-05-17 11:40:40 +03:00
Julia Svinareva 0a1d461763 [DE mobile] Add settings: Display Mode, Accept All Changes, Reject All Changes, Next Change, Previous Change, Accept Change, Reject Change, Description Change in Collaboration. 2019-05-16 19:15:12 +03:00
Julia Radzhabova fceec13206 [PE] Add document info 2019-05-16 15:59:39 +03:00
Julia Radzhabova 59fb4182fb [SSE] Add document info 2019-05-16 11:52:49 +03:00
Julia Radzhabova 08bdb152a7 [DE] Fix loading document info, add translation 2019-05-16 11:49:13 +03:00
Julia Radzhabova d17b3041f3 Merge branch 'release/v5.3.0' into feature/doc-info 2019-05-15 17:29:22 +03:00
Julia Radzhabova bd8e1861ed [DE] Doc info: hide total editing time 2019-05-15 16:49:11 +03:00
Julia Radzhabova 63762a25bd [DE] Doc info: get editing time and authors 2019-05-15 16:28:18 +03:00