Commit graph

392 commits

Author SHA1 Message Date
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
Alexander.Trofimov 964220a560 [de][pe] Refactoring
Table get_Image -> asc_getImage, get_Id -> asc_getId
2019-06-07 18:07:49 +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 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 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 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 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 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 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 Svinareva 40dfd20cdf [DE mobile] Remove delete other people's reviews button in isReviewOnly mode 2019-05-23 16:37:05 +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
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 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 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 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 Svinareva c7a5162e80 [DE mobile] Add modal window collaboration, add Track Changes 2019-05-15 14:48:38 +03:00
Julia Radzhabova 7b56dd5d9f Update translation 2019-05-15 14:22:11 +03:00
Julia Radzhabova 15012c6d3c Update translation 2019-05-13 15:14:50 +03:00
Julia Radzhabova 800204d50a Update translation 2019-05-08 16:36:17 +03:00
Julia Radzhabova 7f192dfc69 Add new action type 2019-05-08 15:09:28 +03:00
Julia Radzhabova a8b228b044 Update translation 2019-05-08 15:09:28 +03:00