Commit graph

310 commits

Author SHA1 Message Date
Julia Radzhabova 8e2b6c270f
Merge pull request #396 from ONLYOFFICE/hotfix/v5.5.3
Hotfix/v5.5.3
2020-05-08 13:06:21 +03:00
Julia Radzhabova 99cee6f85e Send encryptionKeys 2020-05-08 11:58:31 +03:00
JuliaSvinareva fe17bdab26 Merge branch 'feature/mobile-comments' into develop 2020-05-07 20:06:00 +03:00
JuliaSvinareva b944ddccfc [mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft) 2020-05-07 19:28:58 +03:00
JuliaSvinareva a3b347c911 [mobile] Сhanged tabs template into insert 2020-04-30 12:55:09 +03:00
JuliaSvinareva 43c5300cdc [mobile] Comments (fix bugs) 2020-04-24 14:30:55 +03:00
JuliaSvinareva 582c1ab6ce [mobile] Comments (add translations) 2020-04-21 20:38:07 +03:00
JuliaSvinareva 841fd8df02 [mobile] Fix bug 45066 2020-04-16 21:12:06 +03:00
JuliaSvinareva cd4826ff92 [mobile] Comments (added check for the ability to add comments) 2020-04-15 19:50:15 +03:00
Julia Radzhabova 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
JuliaSvinareva 4d5f9edae8 [SSE mobile] Comments (add: add/edit/delete comments, add/edit/delete reply) 2020-04-14 19:28:37 +03:00
JuliaSvinareva 96b9c849ac [PE mobile] Comments (add: add/edit/delete comments, add/edit/delete reply, tab other into insert) 2020-04-10 18:58:59 +03:00
JuliaSvinareva fa6bafaec4 [DE PE SSE mobile] Fix bug 42818 2020-03-26 17:28:54 +03:00
Julia Radzhabova 2e6bff0499 Update translation 2020-03-19 16:04:14 +03:00
Julia Svinareva 9f57ed1bd0 [mobile] fix translations 2020-03-19 15:09:48 +03:00
Julia Svinareva a6eb0b90d3 [mobile] Bug 44415 (add checkbox) 2020-03-19 14:52:52 +03:00
Julia Radzhabova 8d852e957a Merge branch 'release/v5.5.0' into develop 2020-03-05 13:34:31 +03:00
JuliaSvinareva 0a7edc3261
[mobile] Bug 44415 (#343) 2020-02-19 11:15:17 +03:00
Julia Radzhabova 2ff37df87b Set font hinting as Windows by default 2020-02-17 17:30:15 +03:00
Julia Radzhabova 32cb105d4d [PE mobile] Fix opensource warning 2020-02-10 14:43:42 +03:00
Julia Radzhabova 35ea66e440 [PE mobile] Disable editing text and slide in opensource version 2020-02-10 14:37:23 +03:00
Julia Radzhabova dc46e1b97f [PE mobile] Disable editing in opensource version 2020-02-10 12:35:59 +03:00
Julia Radzhabova 19e4859e10 [PE mobile][SSE mobile] Disable editing 2020-02-10 09:49:58 +03:00
Julia Svinareva 81b3b2e5ec [mobile] Fix bug 44416 2020-02-05 15:33:26 +03:00
Julia Svinareva e21c97050c [mobile] Fix bug 44353 2020-01-31 17:29:02 +03:00
JuliaSvinareva e8bbf65fca
[mobile] Fix bug 44004 (#325) 2020-01-30 16:52:03 +03:00
Julia Svinareva 6cc7d096d2 [PE mobile] Fix bug 39401 2020-01-28 17:50:15 +03:00
Julia Svinareva 784a035974 [mobile] Fix bug 44004 2020-01-28 14:15:12 +03:00
Julia Svinareva cbf2bebd7e [PE mobile] Fix bug 41698 2020-01-23 14:08:59 +03:00
Julia Svinareva 275d69f9e2 [PE mobile] Fix bug 41693 2020-01-23 14:08:59 +03:00
Julia Svinareva 1f2b093ed1 [PE mobile] Fix bug 42820 2020-01-23 14:08:59 +03:00
Julia Radzhabova 00fe130b4a Fix mobile loader (#304) 2020-01-17 12:33:03 +03:00
Julia Svinareva c754b4dd53 [mobile] Add logo 2020-01-16 18:27:28 +03:00
Julia Radzhabova 6b58820098 Feature/bugfix (#300)
* [PE] Bug 42759

* Fux Bug 44131

* [SSE] Update skeleton
2020-01-15 16:12:53 +03:00
Julia Svinareva af1d560430 Fix bug 43877 (add display of the current color scheme) 2019-12-24 16:58:06 +03:00
Julia Radzhabova f714a26da7 Change color scheme by index 2019-12-19 11:00:49 +03:00
Julia Svinareva 0b48f70053 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2019-12-16 15:16:32 +03:00
Julia Svinareva 6e8a5309b1 [mobile] Fix bug 43877 2019-12-16 15:16:19 +03:00
Julia Radzhabova add6f62dbd Bug 42788: rename customization->units to customization->unit 2019-12-16 15:01:09 +03:00
Julia Radzhabova 2ee40024e7 Fix Bug 42788: add customization->units parameter to api 2019-12-16 14:02:22 +03:00
Julia Radzhabova 555e3f1803 Bug 43789 2019-12-09 10:49:39 +03:00
Julia Radzhabova 326c469e01 [DE] Deprecate permission.changeHistory parameter 2019-11-29 13:32:53 +03:00
Julia Radzhabova 61ab8193fb Add parameter customization.goback.requestClose to api: send event onRequestClose instead opening customization.goback.url 2019-11-27 10:22:25 +03:00
Julia Radzhabova 6ceb9a08ad Change message for Asc.c_oAscError.ID.UpdateVersion error 2019-11-15 17:11:59 +03:00
Julia Radzhabova 637a129d63 Add Asc.c_oAscError.ID.UpdateVersion error 2019-11-13 14:14:41 +03:00
Julia Radzhabova 10722556a5 Bug 43469 2019-11-06 11:11:30 +03:00
Julia Radzhabova 5d0359456f Fix Bug 43454 2019-11-01 17:43:24 +03:00
Julia Radzhabova 3b79d6d34a Change message for error Asc.c_oAscError.ID.CoAuthoringDisconnect 2019-10-30 17:27:57 +03:00
Julia Radzhabova f6c7e70390
Merge pull request #253 from ONLYOFFICE/feature/mobile-color-picker
Feature/mobile color picker
2019-10-17 13:27:21 +03:00
Julia Svinareva 909077f97c [PE mobile] Custom Color 2019-10-11 15:55:06 +03:00
Julia Svinareva edb33ef4ef [mobile] Bug 39380 2019-10-07 18:02:28 +03:00
Julia Radzhabova 1c83e503a9 Fix skeleton loader (logo icon, presentation loader). Fix embedded mode on IE11. 2019-09-27 18:43:55 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova b4c7fa87f4 [Mobile] Add skeleton to deploy version 2019-09-13 11:39:50 +03:00
Julia Radzhabova be9772abaf [DE mobile][PE mobile] Refactoring spellcheck. Bug 42696 2019-09-04 15:51:09 +03:00
Julia Radzhabova 020d2af2cd Fix Bug 42593 2019-08-28 17:29:39 +03:00
Julia Radzhabova 36e83f7cb3 Merge branch 'develop' into feature/optimization 2019-08-27 13:48:14 +03:00
Julia Radzhabova cbf983a2ee Fix Bug 35189 2019-08-26 13:03:00 +03:00
Julia Svinareva 8a6af205d9 [mobile] Bug 39380 2019-08-23 15:55:30 +03:00
Julia Radzhabova fb0af71a56 [mobile] Bug 39380 2019-08-23 11:59:24 +03:00
Julia Svinareva 20485598b5 [mobile] Bug 39380 2019-08-23 11:42:08 +03:00
Julia Radzhabova 960a107e8e Merge branch 'develop' into feature/optimization 2019-08-19 10:27:00 +03:00
Julia Radzhabova 5b068c5d28 Fix Bug 40231 2019-08-09 10:04:43 +03:00
Julia Radzhabova 4fa9d82523 Update translations 2019-08-02 11:47:28 +03:00
Julia Radzhabova 048e1ab41b
Merge pull request #218 from ONLYOFFICE/feature/mobile-settings
Feature/mobile settings
2019-07-31 13:27:16 +03:00
Julia Radzhabova e669ae922d Bug 40231 2019-07-30 12:05:48 +03:00
Julia Svinareva d9f90692d8 [mobile] Change display Collaboration icons 2019-07-30 11:12:26 +03:00
Julia Radzhabova 3d5351d3f6 [Mobile] Refactoring 2019-07-29 12:49:02 +03:00
Julia Radzhabova a43e7a0c85 Change usage of advanced options on load/save csv, txt, rtf 2019-07-25 10:14:45 +03:00
Julia Radzhabova 4abaffcf88 Change usage of asc_DownloadAs 2019-07-24 11:36:13 +03:00
Julia Svinareva a5a01c0471 [DE mobile] [PE mobile] [SSE mobile] Document Info 2019-07-23 14:40:18 +03:00
Julia Svinareva 7844686a74 [PE mobile] Document Info 2019-07-23 11:18:20 +03:00
Julia Svinareva b0037bdd42 [PE mobile] [SSE mobile] Skeleton loader 2019-07-22 17:09:53 +03:00
Julia Radzhabova 48a92d5fa7
Merge pull request #213 from ONLYOFFICE/feature/mobile-settings
Feature/mobile settings
2019-07-19 17:27:51 +03:00
Julia Svinareva a46b3ee10d [DE mobile] [PE mobile] [SSE mobile] Collaboration moved into Common 2019-07-15 16:06:54 +03:00
Julia Radzhabova 15b584c235 [PE][SSE] Remove nativeApp flag 2019-07-15 11:01:29 +03:00
Julia Radzhabova 1f523a5038
Merge pull request #207 from ONLYOFFICE/feature/mobile-settings
Feature/mobile settings
2019-07-12 12:14:44 +03:00
Julia Svinareva 94be7f9458 [DE mobile] [SSE mobile] [PE mobile] Fix Bug 33999 2019-07-09 11:49:41 +03:00
Julia Radzhabova 0326152908
Merge pull request #197 from ONLYOFFICE/feature/mobile-settings
Feature/mobile settings
2019-06-25 17:44:23 +03:00
Julia Svinareva b03e3e4449 [DE mobile] [PE mobile] [SSE mobile] Add icons 2019-06-25 15:23:24 +03:00
Julia Radzhabova 08e3e47fa1 Merge branch 'hotfix/v5.3.2' into develop 2019-06-21 18:28:46 +03:00
Julia Radzhabova 34950ab65c Merge branch 'feature/mobile-settings' into develop 2019-06-13 11:47:12 +03:00
Alexander.Trofimov c67a8647b7 [pe] Refactorig
Delete asc_CChartStyle. Use CStyleImage. asc_getImageUrl -> asc_getImage, asc_getStyle -> asc_getName
2019-06-11 18:24:00 +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 c9399b90ae [all] extend production tags 2019-06-07 16:49:13 +03:00
Maxim Kadushkin fb2ec72712 [build] apply tags to vary production info 2019-06-07 16:34:54 +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 98fa231d51 [PE mobile] [SSE mobile] Hide Settings in view mode 2019-06-06 14:55:35 +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 d56b256cb3 [PE mobile] Add Collaboration into Toolbar 2019-06-04 09:46:48 +03:00
Julia Svinareva 783ec39e1a [PE mobile] Add Collaboration, add Edit Users, fix less 2019-05-31 19:18:14 +03:00
Julia Svinareva 15cfe7bda2 [PE mobile] [SSE mobile] Fix template 2019-05-28 13:46:21 +03:00
Julia Radzhabova bf8dafb914 Merge feature/mobile-settings to develop 2019-05-23 11:37:12 +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 Radzhabova 7f192dfc69 Add new action type 2019-05-08 15:09:28 +03:00
Julia Radzhabova be0424f28c Update translation 2019-04-29 15:36:01 +03:00
Julia Radzhabova 5f27be56af Update translation 2019-04-29 15:36:01 +03:00