1197 commits

Author	SHA1	Message	Date
Julia Radzhabova	9002d44a7f	Merge pull request #1067 from ONLYOFFICE/feature/sse-protection ... Feature/sse protection	2021-08-12 15:59:32 +03:00
SergeyEzhin	a7fa0baba8	[PE SSE mobile] Fix Bug 47900	2021-08-11 17:47:57 +03:00
SergeyEzhin	d03a11f4cf	[DE PE SSE mobile] Fix Bug 51869	2021-08-11 13:36:50 +03:00
ShimaginAndrey	3f097d5bee	[DE PE SSE] Fix Bug 51823	2021-08-11 12:28:33 +03:00
Julia Radzhabova	dea0fb93d5	[SSE] Change check sorted range	2021-08-11 00:24:12 +03:00
Julia Radzhabova	7dcbc69f1b	Fix sending filetype	2021-08-09 19:09:59 +03:00
Julia Radzhabova	4900bdc57b	Merge pull request #1056 from ONLYOFFICE/feature/bug-fixes ... Feature/bug fixes	2021-08-09 17:59:39 +03:00
SergeyEzhin	46acf8489a	[DE PE SSE mobile] Correct Search	2021-08-09 17:42:18 +03:00
Julia Radzhabova	3ab6e18621	Merge branch 'release/v6.4.0' into develop	2021-08-09 13:30:40 +03:00
Julia Radzhabova	9ea8dc50b4	Merge pull request #1048 from ONLYOFFICE/feature/fix-bug-reactjs ... Feature/fix bug reactjs	2021-08-09 10:52:26 +03:00
JuliaSvinareva	4f8c61b246	[SSE mobile] Fix bug 51623	2021-08-06 19:39:00 +03:00
Julia Radzhabova	4bba1ab170	[Mobile] Update translation	2021-08-06 17:41:44 +03:00
Julia Radzhabova	8cbdfcedfb	Merge branch 'develop' into feature/sse-protection	2021-08-05 13:49:29 +03:00
ShimaginAndrey	b16e82ea2e	[SSE] Fix Bug 51707	2021-08-04 18:09:50 +03:00
Julia Radzhabova	7211050c0d	Merge pull request #1046 from ONLYOFFICE/feature/bug-fixes ... Feature/bug fixes	2021-08-04 17:53:25 +03:00
JuliaSvinareva	ef74be1d0e	[SSE mobile] Fix bug 51623	2021-08-04 14:12:20 +03:00
SergeyEzhin	9b31aee15b	[DE mobile] Fix Bug 51670	2021-08-03 18:14:45 +03:00
SergeyEzhin	90964f12d6	[DE PE SSE mobile] Fix Bug 51655	2021-08-03 15:03:46 +03:00
ShimaginAndrey	edf1d0f491	[DE PE SSE] Add recent-fonts and fix style	2021-08-02 18:40:17 +03:00
Maxim Kadushkin	59db913631	[mobile] skip "loading" label on editor's launch	2021-08-02 14:43:09 +03:00
Julia Radzhabova	3a3d26185f	Update translation	2021-08-02 12:40:28 +03:00
JuliaSvinareva	64fe6ae7f0	[SSE mobile] Fix bug Bug 51631	2021-07-30 18:37:49 +03:00
JuliaSvinareva	b867694b44	[SSE mobile] Fix bug 51623	2021-07-30 18:37:03 +03:00
Julia Radzhabova	c2fdab1dc4	Update translation	2021-07-30 15:34:10 +03:00
SergeyEzhin	764e6c378a	[DE PE SSE mobile] Fix Bug 49540	2021-07-30 14:11:12 +03:00
Julia Radzhabova	92bb409c5a	Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs	2021-07-30 01:01:33 +03:00
maxkadushkin	45687b7606	Merge pull request #1026 from ONLYOFFICE/feature/bug-fixes ... Feature/bug fixes	2021-07-29 16:57:54 +03:00
SergeyEzhin	b6ee364ab5	Fix Bug 50792	2021-07-29 15:27:52 +03:00
Julia Radzhabova	fb5612e265	[SSE] For Bug 51484	2021-07-29 15:12:38 +03:00
SergeyEzhin	69cf357661	[SSE mobile] Correct statusbar	2021-07-28 18:19:46 +03:00
Julia Radzhabova	d767fa5399	Merge branch 'release/v6.4.0' into develop	2021-07-28 00:03:49 +03:00
JuliaSvinareva	ae7767de66	[mobile] Fix bug 51532	2021-07-27 16:58:54 +03:00
SergeyEzhin	55e22d914f	[SSE mobile] Fix Bug 51146	2021-07-27 15:56:11 +03:00
SergeyEzhin	3333037bf7	Remove conflict after merge	2021-07-27 12:06:52 +03:00
SergeyEzhin	735228e51d	[DE SSE mobile] Correct encoding options	2021-07-26 17:58:28 +03:00
SergeyEzhin	33bf343709	[DE mobile] Changed encoding options	2021-07-24 01:38:54 +03:00
Julia Radzhabova	fb325aaa19	Update translation	2021-07-23 20:08:13 +03:00
ShimaginAndrey	e4b47bc252	[DE PE SSE] Fix Bug 51465	2021-07-23 16:09:23 +03:00
SergeyEzhin	116944b181	[SSE mobile] Changed encoding options	2021-07-22 23:32:20 +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
Julia Radzhabova	f13673653f	Merge branch 'release/v6.4.0' into develop	2021-07-22 17:44:51 +03:00
ShimaginAndrey	4e3144a159	Refactoring and fix typeSort	2021-07-22 14:11:29 +03:00
SergeyEzhin	850359ca6d	[SSE mobile] Change Encoding v.2	2021-07-22 02:06:46 +03:00
JuliaSvinareva	bd57ab8c5d	[SSE mobile] Change to add listeners on events in toolbar	2021-07-22 01:10:25 +03:00
JuliaSvinareva	40b9837d55	[SSE mobile] Change to add listeners on events in statusbar	2021-07-22 00:10:20 +03:00
SergeyEzhin	b7d44ced9f	[SSE mobile] Change Encoding	2021-07-21 21:24:04 +03:00
SergeyEzhin	5a30ae5cc9	[SSE mobile] Correct Encoding	2021-07-20 18:09:39 +03:00
Julia Radzhabova	1b163e8dbe	Fix translation	2021-07-20 17:17:45 +03:00
ShimaginAndrey	68ecdfa60e	Fix Bug 51307	2021-07-20 15:10:02 +03:00
maxkadushkin	c934dd3640	Merge branch 'release/v6.4.0' into feature/bug-fixes	2021-07-19 17:24:31 +03:00
Julia Radzhabova	656715a52b	Merge branch 'release/v6.4.0' into develop	2021-07-19 14:37:16 +03:00
SergeyEzhin	a5d2df5a7d	[SSE mobile] Fix Bug 51180	2021-07-19 13:56:51 +03:00
SergeyEzhin	6067e344a2	Fix Bug 49540	2021-07-17 02:45:16 +03:00
Julia Radzhabova	dd6da8de34	Update translation	2021-07-16 17:07:14 +03:00
JuliaSvinareva	4d93ac917d	[mobile] Remove unused code	2021-07-16 14:24:41 +03:00
SergeyEzhin	1b5397d222	[DE SSE mobile] Correct encoding	2021-07-16 13:29:28 +03:00
ShimaginAndrey	2dce8b8db3	[DE PE SSE] Fix Bug 48073	2021-07-15 18:19:32 +03:00
SergeyEzhin	e5b87b9aa6	[SSE mobile] Add encoding options	2021-07-14 20:42:05 +03:00
Julia Radzhabova	4ff491ce98	Update translation	2021-07-13 22:48:21 +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
JuliaSvinareva	a24120bbb4	[SSE mobile] Fix bug 51184	2021-07-09 16:17:28 +03:00
JuliaSvinareva	050c030962	[SSE mobile] Fix bug 51160	2021-07-09 12:51:50 +03:00
ShimaginAndrey	1958189140	refactoring code	2021-07-08 12:39:27 +03:00
ShimaginAndrey	1e0f45842d	Save settings resolvedcomment	2021-07-08 09:59:37 +03:00
ShimaginAndrey	ce9c49beaf	[DE PE SSE] Fix resolved and sort comments	2021-07-07 18:31:44 +03:00
ShimaginAndrey	1486c12cd4	[DE PE SSE]Setting rights for comments	2021-07-06 17:13:55 +03:00
SergeyEzhin	292a517152	[SSE mobile] Correct in edit cell	2021-07-03 16:37:22 +03:00
SergeyEzhin	35ed597900	[SSE mobile] Fix Bug 48032	2021-07-02 20:47:58 +03:00
Julia Radzhabova	9396f76125	[Mobile] Always use user info parser	2021-07-02 02:06:34 +03:00
SergeyEzhin	4940291ce6	[SSE mobile] Fix Bug 43270	2021-07-01 22:11:42 +03:00
ShimaginAndrey	a2172f924d	Common.Utils.UserInfoParser -> AscCommon.UserInfoParser	2021-07-01 12:52:01 +03:00
maxkadushkin	18dfe1500e	Merge pull request #953 from ONLYOFFICE/fix/fix-bugs-on-mobiles ... [mobile] Fix bug 47933, fix context menu in comment mode	2021-06-29 23:24:49 +03:00
JuliaSvinareva	2887aa1b06	[mobile] Fix bug 47933, fix context menu in comment mode	2021-06-29 22:03:37 +03:00
ShimaginAndrey	cf2ff32462	Correct dialog window	2021-06-29 18:38:04 +03:00
ShimaginAndrey	5a0cc476d6	[SSE] Add dialog Sorting	2021-06-29 16:02:49 +03:00
Maxim Kadushkin	bae484e6a4	Merge branch 'feature/load-external-themes' into develop	2021-06-28 23:51:38 +03:00
maxkadushkin	8562f46186	Merge pull request #950 from ONLYOFFICE/feature/Bug_47151 ... Feature/bug 47151	2021-06-28 19:08:31 +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
SergeyEzhin	63eb843170	[SSE mobile] Fix Bug 49377	2021-06-28 15:25:27 +03:00
JuliaSvinareva	175a2a0d44	[SSE mobile] Bug 48387	2021-06-28 14:39:33 +03:00
ShimaginAndrey	b8cbd5cfb7	[SSE] Fix Bug 47151	2021-06-28 11:11:29 +03:00
SergeyEzhin	daa60bdd88	[SSE mobile] Fix Bug 47962	2021-06-25 18:14:24 +03:00
ShimaginAndrey	21b385dcd1	Changing the sorting buttons	2021-06-24 18:18:38 +03:00
SergeyEzhin	d5e1aa57e9	[SSE mobile] Correct store in application settings	2021-06-24 00:07:16 +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
SergeyEzhin	b7d5babce1	[SSE mobile] Fix Bug 50958	2021-06-23 16:08:12 +03:00
ShimaginAndrey	a09aaaf883	[DE PE SSE mobile] Fix Bug 50794	2021-06-23 14:50:39 +03:00
SergeyEzhin	5229b93eeb	[PE mobile] Bug 50789	2021-06-23 00:34:35 +03:00
Julia Radzhabova	fb57f2d0e2	[SSE] Add error on a protected sheet	2021-06-22 16:15:15 +03:00
Julia Radzhabova	4789fd68f0	Fix Bug 27605	2021-06-22 15:42:21 +03:00
Rieffen	6939100df7	Update fr.json	2021-06-21 16:35:31 +02:00
JuliaSvinareva	e3f64d39db	[SSE mobile] Fix bug 50785	2021-06-21 15:29:34 +03:00
ShimaginAndrey	7a3aca5c8f	[PE SSE mobile] Fix Bug 50926	2021-06-21 13:01:40 +03:00
maxkadushkin	3433bbaf1e	Merge pull request #932 from ONLYOFFICE/feature/Bug-50838 ... Fix Bug 50838	2021-06-21 12:27:47 +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
SergeyEzhin	10e10ca77b	[DE PE SSE mobile] Fix Bug 50897	2021-06-18 16:06:53 +03:00
JuliaSvinareva	c632c239bd	[SSE mobile] Bug 50785	2021-06-18 15:42:02 +03:00
SergeyEzhin	055fbeb062	[SSE mobile] Fix Bug 50800	2021-06-18 12:43:41 +03:00
ShimaginAndrey	005bb841dc	Fix Bug 50832	2021-06-17 18:58:45 +03:00
ShimaginAndrey	670910d5f4	[SSE mobile] Bug 50875	2021-06-17 16:11:26 +03:00
SergeyEzhin	31705e5aea	[PE SSE mobile] Fix Bug 50889	2021-06-17 14:53:47 +03:00
ShimaginAndrey	20ec8e4115	Fix Bug 50838	2021-06-17 12:09:30 +03:00
SergeyEzhin	e3b52d0bcb	[DE PE SSE mobile] Fix Bug 50778	2021-06-16 19:14:58 +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	0b2cb9f13d	[SSE mobile] Fix bug 50824	2021-06-11 16:15:57 +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
maxkadushkin	a707da477c	Merge pull request #919 from ONLYOFFICE/feature/release-fixes ... Feature/release fixes	2021-06-09 19:20:29 +03:00
JuliaSvinareva	e2e68d25b5	[mobile] Fix bug 50797	2021-06-09 15:18:04 +03:00
SergeyEzhin	e821bb196e	[SSE mobile] Fix Bug 50791	2021-06-09 13:59:04 +03:00
JuliaSvinareva	4b5f86f75d	[SSE mobile] Fix bug 50765	2021-06-08 19:12:38 +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	04569201b9	[SSE mobile] Fix bug 50037	2021-06-07 15:34:37 +03:00
SergeyEzhin	9f50f96c27	Removed console.log	2021-06-05 13:07:59 +03:00
SergeyEzhin	d8ae65d05d	[DE SSE mobile] Bug 47948	2021-06-05 13:05:28 +03:00
SergeyEzhin	f5ca014da5	[DE PE SSE mobile] Bug 49112	2021-06-03 16:25:52 +03:00
JuliaSvinareva	4f5c9dac5f	Merge branch 'feature/fix-bug-on-reactjs' into develop	2021-05-31 17:07:52 +03:00
JuliaSvinareva	3382d2f373	Merge branch 'feature/develop-fixes' into develop	2021-05-31 16:29:18 +03:00
ShimaginAndrey	a7e8f1812e	Fix Bug 44360	2021-05-31 15:50:56 +03:00
ShimaginAndrey	06da18294a	Disable button in doc	2021-05-31 12:51:18 +03:00
SergeyEzhin	e9eb6fceda	[DE PE SSE mobile] Corrected buttons	2021-05-30 16:34:15 +03:00
Maxim Kadushkin	d3854c0571	[all] added colors table	2021-05-28 17:07:19 +03:00
SergeyEzhin	edd4ed6629	[SSE mobile] Bug 48058	2021-05-28 15:12:21 +03:00
SergeyEzhin	9888430691	[DE PE SSE mobile] Bug 48861	2021-05-28 12:18:26 +03:00
Julia Radzhabova	805452abc9	[SSE][SSE mobile] Add ConfirmReplaceFormulaInTable error	2021-05-27 16:59:39 +03:00
SergeyEzhin	c254f2c93a	Corrected replace all	2021-05-27 15:41:15 +03:00
JuliaSvinareva	5c51353d23	Merge branch 'feature/develop-fixes' into develop	2021-05-27 12:58:19 +03:00
SergeyEzhin	0304b97fa2	[SSE mobile] Correct main.jsx	2021-05-25 18:56:42 +03:00
SergeyEzhin	d871811be4	Correct translation	2021-05-25 18:45:39 +03:00
Julia Radzhabova	98d5a0d8fd	Merge pull request #900 from ONLYOFFICE/feature/user-anonymous ... Feature/user anonymous	2021-05-25 18:34:47 +03:00
JuliaSvinareva	642f72f182	Merge branch 'feature/fix-bug-shimaginA' into develop	2021-05-25 18:01:22 +03:00
Julia Radzhabova	61da979330	Set put_IsAnonymousUser	2021-05-25 16:57:56 +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
JuliaSvinareva	e3be43c3ee	[SSE mobile] Refactoring filter options	2021-05-24 13:32:35 +03:00
ShimaginAndrey	4355f29cfc	Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA ... # Conflicts: # build/package.json	2021-05-24 10:58:40 +03:00
ShimaginAndrey	10927e6f63	Filter Options	2021-05-23 18:27:21 +03:00
SergeyEzhin	1ffa6d8c9d	[SSE mobile] Bug 47073	2021-05-21 19:45:02 +03:00
SergeyEzhin	1cce447301	[DE PE SSE mobile] Bug 50406	2021-05-21 16:37:50 +03:00
SergeyEzhin	9c6a685bf5	[SSE mobile] Bug 49779	2021-05-21 16:02:28 +03:00
Julia Radzhabova	45d7980212	Merge branch 'release/v6.3.0' into develop	2021-05-21 12:28:54 +03:00
SergeyEzhin	b8004facae	[SSE mobile] Correct edit link	2021-05-20 23:05:58 +03:00
SergeyEzhin	fee213f283	[SSE mobile] Bug 48754	2021-05-20 13:37:23 +03:00
SergeyEzhin	001ff01102	[SSE mobile] Bug 50398	2021-05-18 20:59:22 +03:00
SergeyEzhin	1f0b09c539	Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop	2021-05-18 16:07:24 +03:00
SergeyEzhin	75fdffe6a9	[SSE mobile] Corrected add function	2021-05-18 16:06:24 +03:00
JuliaSvinareva	affeda1999	[SSE mobile] Fix templates	2021-05-18 13:46:26 +03:00
JuliaSvinareva	e24fa28ff6	[mobile] Make long actions	2021-05-17 15:36:00 +03:00
JuliaSvinareva	cd396f147f	[SSE mobile] Add skeleton	2021-05-17 14:55:21 +03:00
JuliaSvinareva	6c6f0899ef	Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop	2021-05-14 15:27:11 +03:00
JuliaSvinareva	18e9f7441b	[SSE mobile] Fix error in long actions controller	2021-05-14 15:26:38 +03:00
Julia Radzhabova	a4b302e590	[SSE mobile] Change formulas descriptions	2021-05-14 15:26:31 +03:00
Julia Radzhabova	d7d387c27a	Update translation	2021-05-14 15:02:42 +03:00
Julia Radzhabova	4145b0a443	[SSE mobile] Fix Bug 50398	2021-05-14 13:24:54 +03:00
Maxim Kadushkin	d16354f4f6	[SSE mobile] changes for prod version	2021-05-14 13:08:08 +03:00
Maxim Kadushkin	76c1e846a6	[SSE mobile] changes for prod version	2021-05-14 11:19:30 +03:00
JuliaSvinareva	d9905d9789	[SSE mobile] Fix template of edit cell	2021-05-13 19:05:39 +03:00
JuliaSvinareva	41105c00ef	[SSE mobile] Bug 48623 (Moved code from main controller, removed unused code)	2021-05-13 18:37:00 +03:00
JuliaSvinareva	c36ed41d35	[SSE mobile] Fix translations	2021-05-13 18:34:30 +03:00
JuliaSvinareva	861c60caff	Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop	2021-05-13 18:09:03 +03:00
Maxim Kadushkin	f6648ac5fa	[SSE mobile] debug production version	2021-05-13 17:15:58 +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
Maxim Kadushkin	9a0a89b077	[SSE] fix deployment for mobile app	2021-05-11 20:43:00 +03:00
Maxim Kadushkin	c4955d60fb	[SSE] debug deployment	2021-05-11 13:24:45 +03:00
SergeyEzhin	be110e5eff	[SSE mobile] Bug 48659	2021-05-07 20:29:28 +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
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
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
SergeyEzhin	5a244af7a1	[SSE mobile] Bug 48623	2021-05-04 19:40:35 +03:00
Julia Radzhabova	c84304afd5	[SSE mobile] Fix Bug 50200	2021-05-04 15:54:38 +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
JuliaSvinareva	61998a2c04	[mobile] Add hide navbar when sheet-modal is opened	2021-04-30 16:29:41 +03:00
Julia Radzhabova	7fb36f66f1	Update translation. Fix Bug 50049, Fix Bug 50061	2021-04-30 16:28:59 +03:00
Maxim Kadushkin	3726a1235f	[SSE mobile] refactoring	2021-04-30 15:25:28 +03:00
SergeyEzhin	024e20266d	[SSE mobile] Corrected toolbar	2021-04-30 15:11:18 +03:00
JuliaSvinareva	cc66831f6c	[SSE mobile] Bug 50044	2021-04-30 14:58:41 +03:00
SergeyEzhin	45b0cb2bac	[common] Edits toolbar and corrected searchbar	2021-04-30 01:18:03 +03:00
Maxim Kadushkin	97474af94d	Merge branch 'release/v6.3.0' into develop ... # Conflicts: # apps/common/main/lib/controller/Plugins.js # apps/common/main/lib/view/Header.js # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js # apps/documenteditor/main/app/view/Toolbar.js # apps/documenteditor/main/locale/sl.json # apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js # apps/presentationeditor/main/locale/ja.json # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/template/Toolbar.template # apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js	2021-04-29 23:31:07 +03:00
JuliaSvinareva	705a4f08ae	[SSE mobile] Bug 50044	2021-04-29 19:25:40 +03:00
JuliaSvinareva	5e3730d416	[PE SSE mobile] Fix appOptions	2021-04-29 19:08:58 +03:00
SergeyEzhin	4f6251fcbc	Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits	2021-04-28 17:17:35 +03:00
SergeyEzhin	79cc895ea7	[DE PE mobile] Correct text settings and styles	2021-04-28 16:35:35 +03:00
JuliaSvinareva	cc80c72411	[mobile] Fix icons	2021-04-28 12:33:15 +03:00
SergeyEzhin	141cd15ab6	[DE PE SSE mobile] Moved icon-collaboration	2021-04-28 12:19:09 +03:00
SergeyEzhin	072f84a27c	[DE PE SSE mobile] Corrected display collaboration	2021-04-28 01:15:16 +03:00
Julia Radzhabova	dce1a7a54c	Fix Bug 50044	2021-04-27 17:31:38 +03:00
JuliaSvinareva	1d51be59a6	Merge branch 'feature/mobile-apps-on-reactjs-plugins' into feature/mobile-apps-on-reactjs	2021-04-27 17:28:49 +03:00
SergeyEzhin	a0538ee3e0	[common] Added plugins	2021-04-27 16:39:39 +03:00
ShimaginAndrey	3c97073b0e	Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA	2021-04-27 15:18:14 +03:00
JuliaSvinareva	ad5104c8c5	[mobile] Fix long actions controller	2021-04-26 18:43:12 +03:00
JuliaSvinareva	8fb9119f01	[SSE mobile] Make main controller	2021-04-24 17:57:44 +03:00
Julia Radzhabova	be9918cfa3	Update translation	2021-04-23 16:24:35 +03:00
JuliaSvinareva	0d82918ed5	[SSE mobile] Add error controller, add long actions controller	2021-04-22 21:57:08 +03:00
JuliaSvinareva	588a7f0386	[SSE mobile] Moved edit functions of context menu to private branch	2021-04-22 13:54:26 +03:00
JuliaSvinareva	cfbb8ce795	[SSE mobile] Add toolbar, add logo	2021-04-21 21:04:52 +03:00
JuliaSvinareva	7c72e8cb1b	[SSE mobile] Changes for code decomposition	2021-04-21 16:32:30 +03:00
ShimaginAndrey	9b16457b17	Fix Bug №48073	2021-04-21 12:44:29 +03:00
Julia Radzhabova	a910082c4c	[SSE mobile] Fix Bug 49728	2021-04-19 20:11:09 +03:00
Julia Radzhabova	e591a4477a	Update translation	2021-04-16 17:37:12 +03:00
Julia Radzhabova	94c9e77313	Update translation	2021-04-16 17:18:23 +03:00
JuliaSvinareva	92520c0e13	Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs	2021-04-15 13:26:46 +03:00
Maxim Kadushkin	8943602605	[SSE mobile] added controller for private code	2021-04-13 17:54:42 +03:00
JuliaSvinareva	45bbe12dda	Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs	2021-04-05 20:42:17 +03:00
Julia Radzhabova	9b6ec674de	Merge pull request #779 from ONLYOFFICE/release/v6.3.0 ... Release/v6.3.0	2021-04-02 11:53:39 +03:00
JuliaSvinareva	babe1233a9	[mobile] Add handler for try undo in fast collaborative	2021-04-01 23:27:58 +03:00
SergeyEzhin	dd3b5fafe0	[SSE mobile] Corrected some things	2021-03-30 17:51:53 +03:00
Julia Radzhabova	7e88e04dd2	For Bug 47092	2021-03-30 16:30:01 +03:00
JuliaSvinareva	d1c32d886f	[mobile] Fix add custom color	2021-03-30 16:19:20 +03:00
SergeyEzhin	5a090f8210	Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes	2021-03-30 15:36:06 +03:00
Julia Radzhabova	1e18f144c2	Merge branch 'fix/request-close' into develop	2021-03-30 15:34:56 +03:00
SergeyEzhin	fe684e0edb	[SSE mobile] Corrected highlighting tabs	2021-03-30 15:17:24 +03:00
SergeyEzhin	3f8e1390be	Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-statusbar	2021-03-29 22:13:53 +03:00
SergeyEzhin	722bc4b014	[SSE mobile] Correct tabs is Statusbar	2021-03-29 22:10:45 +03:00
JuliaSvinareva	0824d2388d	[SSE mobile] Fix open worksheet range link in context menu	2021-03-29 20:00:55 +03:00
JuliaSvinareva	5f82245fd2	[SSE mobile] Fix useEffect in statusbar	2021-03-29 19:59:11 +03:00
Julia Radzhabova	b1d3ba3fc0	Merge branch 'release/v6.3.0' into develop	2021-03-29 16:33:45 +03:00
JuliaSvinareva	8d2f89b62e	Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs	2021-03-29 14:49:40 +03:00
SergeyEzhin	25213e6313	[SSE mobile] Some fixes	2021-03-29 14:43:06 +03:00
Julia Radzhabova	84d357560e	Add method requestClose (show warning on unsaved changes)	2021-03-29 14:30:31 +03:00
SergeyEzhin	0cd1dba25c	[SSE mobile] Fixed events	2021-03-29 14:09:13 +03:00
JuliaSvinareva	f9f53e6dfc	Merge branch 'feature/mobile-apps-on-reactjs-about' into feature/mobile-apps-on-reactjs	2021-03-29 13:38:22 +03:00
SergeyEzhin	b774db3255	[SSE mobile] Corrected rename field	2021-03-29 12:35:32 +03:00
Julia Radzhabova	78229a2bab	Merge branch 'develop' into feature/comment-permissions	2021-03-28 22:18:19 +03:00
JuliaSvinareva	eb5a3b438f	[SSE mobile] Add context menu	2021-03-27 16:33:27 +03:00
Julia Radzhabova	bdd940623b	Update translation	2021-03-27 01:02:56 +03:00
Julia Radzhabova	39ddc24254	Update translation	2021-03-27 00:12:55 +03:00
SergeyEzhin	1876de1e87	[mobile] Corrected About	2021-03-26 17:48:18 +03:00
SergeyEzhin	63221e9505	[SSE mobile] Added styles and scrolling sheets	2021-03-26 16:34:46 +03:00
JuliaSvinareva	465fd40004	[SSE mobile] Fix comments	2021-03-26 16:23:17 +03:00
Julia Radzhabova	3b901f91e4	Use sdk class	2021-03-26 14:29:16 +03:00
SergeyEzhin	705509e340	[SSE mobile] Add styles, corrected unhide and hiding	2021-03-25 23:34:22 +03:00
JuliaSvinareva	56e316738e	[SSE mobile] Add comments	2021-03-25 01:07:10 +03:00
SergeyEzhin	61b1c71319	[SSE mobile] Added more in Context Menu, make touch events for sheets list in Statusbar	2021-03-24 20:50:09 +03:00
SergeyEzhin	5f1f608b0a	[SSE mobile] Added unhide in Context Menu	2021-03-24 01:46:37 +03:00