Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
9191 commits 47 branches 5000 tags 623 MiB
Commit graph

2585 commits

Author SHA1 Message Date
OVSharova 66b308e733 Add less 2021-07-26 04:20:39 +03:00
OVSharova 9e89e09b5b Moove Preview 2021-07-26 02:01:00 +03:00
OVSharova 85aaf2a98e All actions 2021-07-25 23:12:20 +03:00
Julia Radzhabova fb325aaa19 Update translation 2021-07-23 20:08:13 +03:00
Julia Radzhabova e1fc8d4de3 Fix Bug 51491 2021-07-23 19:38:42 +03:00
Julia Radzhabova f305e57396 Fix Bug 51487 2021-07-23 17:40:21 +03:00
ShimaginAndrey e4b47bc252 [DE PE SSE] Fix Bug 51465 2021-07-23 16:09:23 +03:00
OVSharova ce7962016b include settings 2021-07-23 03:45:03 +03:00
Julia Radzhabova 340f1b110a
Merge pull request #1007 from ONLYOFFICE/fix/fix-bugs-on-mobiles 
Fix/fix bugs on mobiles
 2021-07-22 23:16:59 +03:00
maxkadushkin f06ee2f5db
Merge pull request #1001 from ONLYOFFICE/feature/fix-bug-reactjs 
Feature/fix bug reactjs
 2021-07-22 22:32:53 +03:00
JuliaSvinareva 0f8d9d4c1a [DE PE mobile] Add toolbar store 2021-07-22 17:58:48 +03:00
JuliaSvinareva e631e35f5f [PE mobile] Fix adding listeners in toolbar 2021-07-22 17:48:46 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Julia Radzhabova 0dd78bff97 Fix translation 2021-07-22 17:04:58 +03:00
Julia Radzhabova 009779620d Bug 44511 2021-07-22 12:40:13 +03:00
OVSharova ea6479f18c start settings 2021-07-22 02:09:53 +03:00
Julia Radzhabova f142cfb697 Fix changing dataview items 2021-07-21 21:05:42 +03:00
maxkadushkin 4c67f91240
Merge pull request #998 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-07-21 11:27:14 +03:00
OVSharova de564a6968 Create listEffects 2021-07-21 05:25:56 +03:00
Julia Radzhabova 148bc3e179 Add download as docm/pptm/xlsm 2021-07-20 21:30:09 +03:00
Julia Radzhabova 1b163e8dbe Fix translation 2021-07-20 17:17:45 +03:00
OVSharova 5c8af47f25 Simple elements created 2021-07-20 05:35:56 +03:00
SergeyEzhin d75eb80c4d [PE mobile] Fix Bug 51377 2021-07-19 19:48:11 +03:00
OVSharova 8e67fbc9a5 Create button preview 2021-07-19 15:08:11 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
OVSharova 5abe22fa6e moove to PE 2021-07-18 02:15:10 +03:00
OVSharova 3a8bebbaf7 Cleaner tab 2021-07-17 13:47:50 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
OVSharova b7801e5a2e copy tab 2021-07-16 17:31:23 +03:00
Julia Radzhabova dd6da8de34 Update translation 2021-07-16 17:07:14 +03:00
ShimaginAndrey dc50581e7c [DE PE] Fix Bug 47943 2021-07-16 16:18:10 +03:00
JuliaSvinareva 4d93ac917d [mobile] Remove unused code 2021-07-16 14:24:41 +03:00
ShimaginAndrey 2dce8b8db3 [DE PE SSE] Fix Bug 48073 2021-07-15 18:19:32 +03:00
JuliaSvinareva a6134b58a1 Fix hint manager 2021-07-15 17:20:58 +03:00
ShimaginAndrey 665d985de2 [PE] Fix Bug 47908 2021-07-15 16:15:32 +03:00
Julia Radzhabova 5460ad804c Fix Bug 50945 2021-07-15 00:35:56 +03:00
Julia Radzhabova 4ff491ce98 Update translation 2021-07-13 22:48:21 +03:00
Julia Radzhabova 64854721e3 Update translation 2021-07-13 11:26:38 +03:00
JuliaSvinareva 3a65ac540f Hint manager: fix locking key events, fix click/mousedown handling 2021-07-12 19:33:05 +03:00
Julia Radzhabova 60f2c149e3
Merge pull request #967 from ONLYOFFICE/feature/access-to-comments 
Feature/access to comments
 2021-07-12 19:26:59 +03:00
maxkadushkin cd9ff4a918
Merge pull request #974 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-07-12 16:48:33 +03:00
Julia Radzhabova 79376446c2
Merge pull request #973 from ONLYOFFICE/feature/color-palette-focus 
Feature/color palette focus
 2021-07-12 13:59:52 +03:00
Julia Radzhabova d6da7e82a2 Update translation. Fix Bug 51170 2021-07-12 11:50:18 +03:00
Julia Radzhabova b1534675c4 For Bug 42150 2021-07-12 11:12:02 +03:00
Julia Radzhabova cc271cd723 Bug 42150: add sort direction 2021-07-12 00:30:52 +03:00
Julia Radzhabova 9eeba125d0 Refactoring 2021-07-11 13:49:39 +03:00
Julia Radzhabova 1a055fcbcc Refactoring Common.UI.ButtonColored 2021-07-11 02:25:12 +03:00
Julia Radzhabova a7c5c47b0b [DE][PE] Fix highlight color button 2021-07-10 22:54:51 +03:00
SergeyEzhin 55e8fbea42 Bug 49294 2021-07-09 16:58:57 +03:00
Julia Radzhabova 07417a29d0 Color palette refactoring 2021-07-09 13:52:48 +03:00
JuliaSvinareva 8bf91f4847 Fix hint manager, add hint visible checks to close panels in left menu 2021-07-08 20:20:34 +03:00
Julia Radzhabova 91c9872ffc Add close comments button. Layout refactoring 2021-07-07 01:51:19 +03:00
Julia Radzhabova 79dbe85bdf Sort comments by date and author 2021-07-06 22:58:36 +03:00
ShimaginAndrey 1486c12cd4 [DE PE SSE]Setting rights for comments 2021-07-06 17:13:55 +03:00
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
Julia Radzhabova 4a706880e8 Add translation 2021-07-02 17:29:06 +03:00
Julia Radzhabova 9396f76125 [Mobile] Always use user info parser 2021-07-02 02:06:34 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
ShimaginAndrey a2172f924d Common.Utils.UserInfoParser -> AscCommon.UserInfoParser 2021-07-01 12:52:01 +03:00
Julia Radzhabova c55886f6e3 [PE] Refactoring disable editing 2021-07-01 01:10:14 +03:00
Julia Radzhabova 52d179153b Always use user info parser 2021-06-30 21:04:25 +03:00
JuliaSvinareva 2887aa1b06 [mobile] Fix bug 47933, fix context menu in comment mode 2021-06-29 22:03:37 +03:00
Julia Radzhabova a8579827e0 File menu refactoring 2021-06-29 16:09:15 +03:00
Maxim Kadushkin 797a657ce5 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2021-06-28 23:52:22 +03:00
Maxim Kadushkin bae484e6a4 Merge branch 'feature/load-external-themes' into develop 2021-06-28 23:51:38 +03:00
Julia Radzhabova 97c7708d0d Disable save, undo/redo on disconnect 2021-06-28 22:17:56 +03:00
Julia Radzhabova be57b1fae7 Disable language button on disconnect 2021-06-28 21:10:28 +03:00
maxkadushkin adb073b2ae
Merge pull request #949 from ONLYOFFICE/fix/fix-bugs-on-mobiles 
Fix/fix bugs on mobiles
 2021-06-28 17:52:35 +03:00
JuliaSvinareva dbf70c662a [mobile] Bug 47107 2021-06-28 17:45:02 +03:00
maxkadushkin 2839960906
Merge pull request #948 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-06-28 15:54:13 +03:00
JuliaSvinareva cc850adfcc [DE PE mobile] Fix bug 50773 2021-06-28 15:52:28 +03:00
maxkadushkin 5fee8bdb34
Merge pull request #942 from ONLYOFFICE/feature/Bug_50794 
Fix Bug 50794
 2021-06-28 10:46:25 +03:00
SergeyEzhin 08713dbe99 [DE PE mobile] Correct app options 2021-06-25 20:36:28 +03:00
Julia Radzhabova 26b2384ba1 Update translation 2021-06-25 18:40:02 +03:00
Julia Radzhabova 36f718d161 Update translation 2021-06-25 11:46:08 +03:00
Maxim Kadushkin 4afe790e0f [themes] refactoring 2021-06-25 11:03:05 +03:00
Julia Radzhabova 2edcfb779b [PE embedded][SSE embedded] Show loader mask 2021-06-25 00:48:20 +03:00
ShimaginAndrey 9bdd5c9d2f Fix Bug 50794 2021-06-24 11:19:36 +03:00
JuliaSvinareva db54743eca Hint Manager: add direction exceptions for filter buttons, add ability to add specific hints to buttons 2021-06-23 18:41:38 +03:00
maxkadushkin 164e2c7815
Merge pull request #941 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-06-23 17:23:57 +03:00
maxkadushkin 4e2962174b
Merge branch 'release/v6.4.0' into feature/fix-bug-reactjs 2021-06-23 16:19:29 +03:00
ShimaginAndrey a09aaaf883 [DE PE SSE mobile] Fix Bug 50794 2021-06-23 14:50:39 +03:00
SergeyEzhin c5874e48ac [PE mobile] Fix Bug 47072 2021-06-23 01:38:47 +03:00
maxkadushkin 8682fcd203
Merge pull request #937 from ONLYOFFICE/feature/bug-fixes 
[PE mobile] Fix Bug 50946
 2021-06-22 18:28:04 +03:00
Julia Radzhabova 4789fd68f0 Fix Bug 27605 2021-06-22 15:42:21 +03:00
SergeyEzhin 91c3517696 [PE mobile] Fix Bug 50946 2021-06-22 00:42:02 +03:00
JuliaSvinareva a8c09d3200 [PE] Hint Manager: add hints in file menu, left menu, statusbar 2021-06-21 20:49:45 +03:00
Rieffen 4a7cbba830
Update fr.json 2021-06-21 16:29:57 +02:00
SergeyEzhin 698d85360a [PE mobile] Fix Bug 50847 2021-06-21 16:05:01 +03:00
SergeyEzhin b5bbb3c6b4 [PE mobile] Fix Bug 50845 2021-06-21 15:03:09 +03:00
ShimaginAndrey 7a3aca5c8f [PE SSE mobile] Fix Bug 50926 2021-06-21 13:01:40 +03:00
maxkadushkin 71e1dd4669
Merge pull request #931 from ONLYOFFICE/fix/fix-bugs-on-mobiles 
Fix/fix bugs on mobiles
 2021-06-18 21:13:12 +03:00
JuliaSvinareva 5a6dfc5e8e [mobile] Fix bug 50878 2021-06-18 20:49:51 +03:00
Julia Radzhabova dfa8cbd80d
Merge pull request #930 from ONLYOFFICE/fix/bugfix 
Fix/bugfix
 2021-06-18 17:29:05 +03:00
maxkadushkin 0c95c2ec2b
Merge pull request #929 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-06-18 17:03:08 +03:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
SergeyEzhin 10e10ca77b [DE PE SSE mobile] Fix Bug 50897 2021-06-18 16:06:53 +03:00
Julia Radzhabova 8e85201c16 Update translation 2021-06-18 13:06:41 +03:00
JuliaSvinareva d31dd64efe [PE mobile] Fix bug 50867 2021-06-18 12:51:50 +03:00
Julia Radzhabova fbdaa0e0f6
Merge pull request #926 from ONLYOFFICE/fix/bug-50447 
Fix/bug 50447
 2021-06-18 10:36:14 +03:00
ShimaginAndrey 005bb841dc Fix Bug 50832 2021-06-17 18:58:45 +03:00
SergeyEzhin 31705e5aea [PE SSE mobile] Fix Bug 50889 2021-06-17 14:53:47 +03:00
SergeyEzhin 6c9ad62861 [PE mobile] Fix Bug 50848 2021-06-16 19:20:59 +03:00
SergeyEzhin e3b52d0bcb [DE PE SSE mobile] Fix Bug 50778 2021-06-16 19:14:58 +03:00
JuliaSvinareva eca0abff3b [PE] Hint Manager: add hints in toolbar, right menu 2021-06-16 16:43:51 +03:00
ShimaginAndrey 237d03ea57 Fix Bug 50831 2021-06-15 16:14:02 +03:00
maxkadushkin 6b97f80337
Merge pull request #923 from ONLYOFFICE/feature/bug-fixes 
Feature/bug fixes
 2021-06-11 23:47:12 +03:00
SergeyEzhin 571768c1ff [DE PE SSE mobile] Bug 47148 2021-06-11 17:20:32 +03:00
JuliaSvinareva bafa7f9688 [mobile] Fix bug 50823 2021-06-11 15:12:28 +03:00
SergeyEzhin 210e8dcd3b [DE PE SSE mobile] Fix Bug 50796 2021-06-11 01:08:23 +03:00
SergeyEzhin 80bbdf2828 [PE SSE mobile] Fix Bug 50792 2021-06-10 19:53:15 +03:00
Maxim Kadushkin b49af817e2 [all mobile] emulate default device when it's not a compatible 2021-06-10 16:05:55 +03:00
ShimaginAndrey b42b14903f Add multilevel list presentation 2021-06-10 15:28:21 +03:00
maxkadushkin a707da477c
Merge pull request #919 from ONLYOFFICE/feature/release-fixes 
Feature/release fixes
 2021-06-09 19:20:29 +03:00
SergeyEzhin 7b3c27c619 [PE mobile] Fix Bug 50793 2021-06-09 16:28:16 +03:00
JuliaSvinareva e2e68d25b5 [mobile] Fix bug 50797 2021-06-09 15:18:04 +03:00
JuliaSvinareva 464fd70b5b [DE PE SSE mobile] Fix bug 50779 2021-06-08 18:39:39 +03:00
JuliaSvinareva 77773d2c40 [DE PE SSE] Fix bug 50766 2021-06-08 18:22:28 +03:00
SergeyEzhin 47a4436d06 [DE PE SSE mobile] Correct application settings and comments 2021-06-07 19:54:19 +03:00
SergeyEzhin f9aefa5170 [PE mobile] Correct application settings 2021-06-07 13:13:14 +03:00
Maxim Kadushkin c0c4766574 [SSE PE] fix bug 50724 2021-06-04 10:34:56 +03:00
SergeyEzhin f5ca014da5 [DE PE SSE mobile] Bug 49112 2021-06-03 16:25:52 +03:00
SergeyEzhin ddae1f9da3 [PE mobile] Bug 49391 2021-06-01 18:38:08 +03:00
JuliaSvinareva 36f75e01ed [PE mobile] Removed ignore format error 2021-05-31 17:14:51 +03:00
JuliaSvinareva 4f5c9dac5f Merge branch 'feature/fix-bug-on-reactjs' into develop 2021-05-31 17:07:52 +03:00
ShimaginAndrey ac56abf8d3 Fix Bug 44360 presentation 2021-05-31 16:52:34 +03:00
JuliaSvinareva 3382d2f373 Merge branch 'feature/develop-fixes' into develop 2021-05-31 16:29:18 +03:00
SergeyEzhin e9eb6fceda [DE PE SSE mobile] Corrected buttons 2021-05-30 16:34:15 +03:00
SergeyEzhin c43062883b [PE mobile] Correct navbars 2021-05-29 20:40:36 +03:00
Maxim Kadushkin d3854c0571 [all] added colors table 2021-05-28 17:07:19 +03:00
Julia Radzhabova 8e5073d912 Update translation. Fix Bug 47165. 2021-05-28 15:21:04 +03:00
SergeyEzhin 9888430691 [DE PE SSE mobile] Bug 48861 2021-05-28 12:18:26 +03:00
SergeyEzhin c254f2c93a Corrected replace all 2021-05-27 15:41:15 +03:00
SergeyEzhin dcfc625408 [PE mobile] Corrected navbars in EditShape 2021-05-27 14:46:53 +03:00
JuliaSvinareva 5c51353d23 Merge branch 'feature/develop-fixes' into develop 2021-05-27 12:58:19 +03:00
ShimaginAndrey c51221e46e Fix Bug 48186 addition 2021-05-26 20:25:04 +03:00
Julia Radzhabova 7b3fc3406a [PE] Fix Bug 50578 2021-05-26 14:32:39 +03:00
evgenykatyshev 89f1746dbe Update icons for 125 and 175% 2021-05-25 23:39:55 +03:00
Julia Radzhabova 61da979330 Set put_IsAnonymousUser 2021-05-25 16:57:56 +03:00
Julia Radzhabova f52a6b459b [Embedded] Load id and name for anonymous user 2021-05-25 16:40:40 +03:00
Julia Radzhabova d99ad6b1fc Save user id for anonymous user (when user.id is undefined). 
[Mobile] Fix loading name for guest user
 2021-05-25 16:39:12 +03:00
maxkadushkin a68c38f83c
Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1 
Feature/hotfix 6 3 1
 2021-05-23 21:36:43 +03:00
Julia Radzhabova 6bc911c9db Update translation 2021-05-21 17:35:29 +03:00
Julia Radzhabova 5dc775f830
Merge pull request #894 from ONLYOFFICE/fix/def-lang 
Fix/def lang
 2021-05-21 17:14:13 +03:00
SergeyEzhin 1cce447301 [DE PE SSE mobile] Bug 50406 2021-05-21 16:37:50 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 44210f7a5a [all] prepare sprites for 1.25x and 1.75x scaling 2021-05-21 11:19:26 +03:00
Julia Radzhabova e184d4b140 [Embedded] Fix styles 2021-05-20 14:11:58 +03:00
Julia Radzhabova a405a14afc Update translation 2021-05-19 23:59:47 +03:00
Julia Radzhabova 99d33c2c5c Bug 50447 2021-05-19 23:54:27 +03:00
Julia Radzhabova c44a6d4b99 Add autocorrect option: Capitalize first letter of sentence. 2021-05-19 20:53:49 +03:00
Julia Radzhabova d0a59a5078 Update translation 2021-05-19 17:32:45 +03:00
Julia Radzhabova 23ac69f964 [Embedded] Change settings menu 2021-05-19 17:29:13 +03:00
Julia Radzhabova 892fd142ac [SSE embedded] Change layout 2021-05-19 16:35:59 +03:00
Maxim Kadushkin 00b8e67c68 [PE] fix bug 50284 2021-05-19 15:08:04 +03:00
Julia Radzhabova c143e5b811 [PE embedded] Change layout 2021-05-19 02:34:57 +03:00
Julia Radzhabova be03943431 Update translation. Bug 50473 2021-05-18 22:47:09 +03:00
Julia Radzhabova f49703ddf7 Update help 2021-05-18 13:38:59 +03:00
JuliaSvinareva e24fa28ff6 [mobile] Make long actions 2021-05-17 15:36:00 +03:00
JuliaSvinareva 2355a62aa7 [PE mobile] Fix toolbar 2021-05-17 14:43:08 +03:00
JuliaSvinareva 89b98477bf [PE mobile] Add skeleton 2021-05-17 13:51:50 +03:00
Maxim Kadushkin b080fb0800 [PE] fix bug 50330 2021-05-15 01:06:28 +03:00
Julia Radzhabova 510c43a89c Update help 2021-05-14 18:39:15 +03:00
Julia Radzhabova a6164ccffc [PE] Update help 2021-05-14 17:37:39 +03:00
Maxim Kadushkin 1e175f338a [all] fix bug 50414 2021-05-14 15:32:03 +03:00
Julia Radzhabova 149f748f59 Update translation 2021-05-14 15:15:14 +03:00
Julia Radzhabova d7d387c27a Update translation 2021-05-14 15:02:42 +03:00
Julia Radzhabova cb6998eac6 Fix Bug 50389. Refactoring listview. 2021-05-13 20:30:57 +03:00
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
Julia Radzhabova b14b245698 Show file versions for wopi 2021-05-13 14:45:53 +03:00
Julia Radzhabova 5c7350e28f Support rename for wopi 2021-05-12 19:04:14 +03:00
Maxim Kadushkin f900a3480b [all] extend options on desktop app launch 2021-05-12 16:41:59 +03:00
Julia Radzhabova df1015d826 Refactoring 2021-05-12 14:36:24 +03:00
JuliaSvinareva bd08e74547 [mobile] Fix collaboration display 2021-05-12 14:27:03 +03:00
Maxim Kadushkin 486afef46d [all] debug deployment 2021-05-12 13:44:17 +03:00
Julia Radzhabova 59bb490069 Show error if default lang isn't loaded 2021-05-12 12:33:10 +03:00
Julia Radzhabova e8d4de37e6 Add parameter for default interface language 2021-05-12 01:33:51 +03:00
JuliaSvinareva cc7d9acfaa [DE PE mobile] Bug 50044 2021-05-11 18:52:36 +03:00
Julia Radzhabova be4a444adb Fix Bug 50298 2021-05-11 15:24:53 +03:00
Julia Radzhabova bb877dd34f Update translation 2021-05-07 13:08:10 +03:00
Julia Radzhabova 33c3c9c887 Update help 2021-05-07 12:37:17 +03:00
Julia Radzhabova 6360a44929 Update translation 2021-05-07 12:34:03 +03:00
SergeyEzhin 5c6d736f9a [DE PE SSE mobile] Bug 47749 2021-05-06 15:29:19 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +03:00
SergeyEzhin 0b17b27492 Bug 49336 2021-05-05 19:04:31 +03:00
Maxim Kadushkin 295bc949c9 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-05 00:31:01 +03:00
Maxim Kadushkin 9693ced4c0 Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into develop 2021-05-05 00:12:41 +03:00
SergeyEzhin 6f328beca6 Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into feature/mobile-apps-on-reactjs-fixes 2021-05-04 21:07:52 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Julia Radzhabova 79a4ad4542 Update help 2021-05-04 17:26:37 +03:00
Julia Radzhabova f5ec7cce4d For Bug 50012 2021-05-04 15:32:26 +03:00
SergeyEzhin 5e70754a55 [PE mobile] Corrected buttons for android 2021-05-04 14:12:00 +03:00
SergeyEzhin 3a1c2ca2a2 [PE mobile] Corrected bug in EditText and correct bug 50044 2021-05-04 01:43:10 +03:00
Maxim Kadushkin fdda540c47 [all] fix loading sdk scripts 2021-05-03 20:02:21 +03:00
JuliaSvinareva 7bb9cc90ab Merge branch 'feature/mobile-apps-on-reactjs-bug50044' into develop 2021-05-01 18:41:17 +03:00
Maxim Kadushkin 374d67c75a Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 
# Conflicts:
#	apps/presentationeditor/mobile/locale/pt.json
 2021-04-30 19:35:55 +03:00
Maxim Kadushkin 75667dc229 Merge branch 'feature/mobile-apps-on-reactjs' into develop 
# Conflicts:
#	apps/api/documents/api.js
#	apps/common/main/lib/util/utils.js
#	apps/documenteditor/mobile/app/controller/DocumentHolder.js
#	apps/documenteditor/mobile/app/controller/Main.js
#	apps/documenteditor/mobile/app/controller/Search.js
#	apps/documenteditor/mobile/app/controller/Settings.js
#	apps/documenteditor/mobile/app/controller/Toolbar.js
#	apps/documenteditor/mobile/app/controller/add/AddImage.js
#	apps/documenteditor/mobile/app/controller/add/AddOther.js
#	apps/documenteditor/mobile/app/controller/add/AddTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditChart.js
#	apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/documenteditor/mobile/app/controller/edit/EditImage.js
#	apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
#	apps/documenteditor/mobile/app/controller/edit/EditShape.js
#	apps/documenteditor/mobile/app/controller/edit/EditTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditText.js
#	apps/documenteditor/mobile/app/template/EditTable.template
#	apps/documenteditor/mobile/app/template/EditText.template
#	apps/documenteditor/mobile/app/template/Settings.template
#	apps/documenteditor/mobile/app/view/Settings.js
#	apps/documenteditor/mobile/app/view/add/AddOther.js
#	apps/documenteditor/mobile/app/view/edit/EditTable.js
#	apps/documenteditor/mobile/index.html
#	apps/documenteditor/mobile/index.html.deploy
#	apps/documenteditor/mobile/index_loader.html
#	apps/documenteditor/mobile/locale/en.json
#	apps/documenteditor/mobile/locale/ru.json
#	apps/documenteditor/mobile/resources/css/app-ios.css
#	apps/documenteditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/presentationeditor/mobile/app-dev.js
#	apps/presentationeditor/mobile/app.js
#	apps/presentationeditor/mobile/app/controller/DocumentHolder.js
#	apps/presentationeditor/mobile/app/controller/Main.js
#	apps/presentationeditor/mobile/app/controller/Search.js
#	apps/presentationeditor/mobile/app/controller/Settings.js
#	apps/presentationeditor/mobile/app/controller/Toolbar.js
#	apps/presentationeditor/mobile/app/controller/add/AddImage.js
#	apps/presentationeditor/mobile/app/controller/add/AddLink.js
#	apps/presentationeditor/mobile/app/controller/add/AddTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
#	apps/presentationeditor/mobile/app/controller/edit/EditImage.js
#	apps/presentationeditor/mobile/app/controller/edit/EditLink.js
#	apps/presentationeditor/mobile/app/controller/edit/EditShape.js
#	apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/controller/edit/EditTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditText.js
#	apps/presentationeditor/mobile/app/template/EditSlide.template
#	apps/presentationeditor/mobile/app/template/EditTable.template
#	apps/presentationeditor/mobile/app/template/EditText.template
#	apps/presentationeditor/mobile/app/view/Settings.js
#	apps/presentationeditor/mobile/app/view/add/AddOther.js
#	apps/presentationeditor/mobile/app/view/add/AddSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditTable.js
#	apps/presentationeditor/mobile/index.html
#	apps/presentationeditor/mobile/index.html.deploy
#	apps/presentationeditor/mobile/index_loader.html
#	apps/presentationeditor/mobile/locale/cs.json
#	apps/presentationeditor/mobile/locale/de.json
#	apps/presentationeditor/mobile/locale/en.json
#	apps/presentationeditor/mobile/locale/es.json
#	apps/presentationeditor/mobile/locale/fr.json
#	apps/presentationeditor/mobile/locale/hu.json
#	apps/presentationeditor/mobile/locale/it.json
#	apps/presentationeditor/mobile/locale/ko.json
#	apps/presentationeditor/mobile/locale/nl.json
#	apps/presentationeditor/mobile/locale/pl.json
#	apps/presentationeditor/mobile/locale/pt.json
#	apps/presentationeditor/mobile/locale/ru.json
#	apps/presentationeditor/mobile/locale/sk.json
#	apps/presentationeditor/mobile/locale/zh.json
#	apps/presentationeditor/mobile/resources/css/app-ios.css
#	apps/presentationeditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/mobile/resources/less/app-ios.less
#	apps/presentationeditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
#	apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
#	apps/spreadsheeteditor/mobile/app/controller/Main.js
#	apps/spreadsheeteditor/mobile/app/controller/Search.js
#	apps/spreadsheeteditor/mobile/app/controller/Settings.js
#	apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
#	apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
#	apps/spreadsheeteditor/mobile/app/template/EditCell.template
#	apps/spreadsheeteditor/mobile/app/template/EditImage.template
#	apps/spreadsheeteditor/mobile/app/template/EditText.template
#	apps/spreadsheeteditor/mobile/app/template/Settings.template
#	apps/spreadsheeteditor/mobile/app/view/Settings.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/view/edit/EditText.js
#	apps/spreadsheeteditor/mobile/index.html
#	apps/spreadsheeteditor/mobile/index.html.deploy
#	apps/spreadsheeteditor/mobile/index_loader.html
#	apps/spreadsheeteditor/mobile/locale/en.json
#	apps/spreadsheeteditor/mobile/resources/css/app-ios.css
#	apps/spreadsheeteditor/mobile/resources/css/app-material.css
#	apps/spreadsheeteditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/statusbar.less
#	build/package.json
 2021-04-30 19:29:10 +03:00
Julia Radzhabova 45aee08641 Update translation 2021-04-30 18:25:46 +03:00
Julia Radzhabova e265dd3aaf [PE] Update help 2021-04-30 17:42:55 +03:00