Commit Graph

486 Commits

Author SHA1 Message Date
Akmal Isomadinov
db10eccbfd Web:EmptyContainer Added room root empty screen, refactoring and optimization 2024-08-08 19:36:57 +05:00
04cf1999d7 Merge branch 'develop' into refactoring/global-colors 2024-08-06 13:59:26 +03:00
43dc2b9c72 Update yarn.lock 2024-07-24 16:32:32 +03:00
86913f183b Update yarn.lock 2024-07-22 13:39:25 +04:00
e04a925303 Merge branch 'develop' into feature/update-react-router-dom 2024-07-17 15:22:40 +03:00
54a5b93ac0 Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectFileStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
2024-07-16 12:59:23 +04:00
82cd218289 Merge branch 'develop' into feature/update-react-router-dom 2024-07-12 15:04:01 +03:00
76bb8cb3b9 Update react-router-dom 2024-07-12 13:32:43 +03:00
99e265ebee Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/components/PrivateRouteWrapper/index.tsx
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/login/src/app/layout.tsx
#	packages/login/src/components/LoginForm/index.tsx
#	packages/login/src/middleware.ts
#	packages/login/src/utils/index.ts
#	packages/shared/components/table/TableHeader.tsx
#	packages/shared/routes/Route.private.tsx
2024-07-11 12:27:31 +04:00
Akmal Isomadinov
4d0d221397 Client:InfoPanel:History: Fixed Bug 68964 2024-07-03 19:42:57 +05:00
0fb2b762c0 Merge branch 'develop' into feature/oauth2-client 2024-06-24 14:01:36 +03:00
11687a5acb Remove @loadable 2024-06-24 12:17:13 +03:00
efc5556525 Remove react-router 2024-06-20 13:07:03 +03:00
2a6210f9eb Up version react-router and react-router-dom to 6.23.1 2024-06-19 19:59:24 +03:00
ba2228fdca Update yarn to v4.3.0 2024-06-19 16:16:11 +04:00
b7fbb88185 Merge branch 'develop' into feature/oauth2-client 2024-06-14 12:32:13 +03:00
83aa877b74 Merge branch 'develop' into feature/hcaptcha 2024-06-13 10:40:17 +03:00
0fc19070dc Login: add recaptcha component 2024-06-06 16:12:25 +03:00
fb3a0c51af Update yarn.lock 2024-05-30 10:07:20 +03:00
996c79d617 Revert "Merge branch 'develop'"
This reverts commit da29dab3bf.
2024-05-28 14:05:49 +03:00
da29dab3bf Merge branch 'develop' 2024-05-28 14:04:24 +03:00
9594256e2f Client:PortalSettings:OAuth: fix table and row view 2024-05-28 13:53:42 +03:00
3bb3c7d5ea Merge branch 'develop' into feature/oauth2-client 2024-05-23 18:23:05 +03:00
Akmal Isomadinov
0ed15b3b08 Client: Added ts-pattern package 2024-05-13 21:07:07 +05:00
28829e9faf Update yarn.lock 2024-05-02 17:09:12 +03:00
3ddcff4388 Login(nextjs): refactoring 2024-04-27 13:32:07 +03:00
5f17d5a0c6 Merge branch 'develop' into feature/login-nextjs 2024-04-15 10:05:00 +03:00
e893dd568a Merge branch 'develop' into feature/login-nextjs 2024-04-11 11:27:37 +03:00
14840653de Merge branch 'release/v2.5.0' into feature/sdk-codeblock-redesign 2024-04-10 14:00:46 +03:00
1c29f240c2 Doceditor: apply document-editor-react 1.5.1 from npm 2024-04-04 12:07:08 +03:00
c5d6489d7f Doceditor: show access denied and file not found errors in doceditor 2024-04-02 09:47:50 +03:00
7690966367 Client: PortalSettings: Change code block for JS SDK 2024-04-02 08:27:52 +03:00
62ea894caa Login(nextjs): add part of LoginForm 2024-04-01 09:56:54 +03:00
290d3a5879 Doceditor: update version for onlyoffice-document-editor-react 2024-03-29 12:15:31 +03:00
42ce320369 Login(nextjs): add some components 2024-03-29 11:51:23 +03:00
3a17f2db98 Login(nextjs): init commit 2024-03-25 12:20:44 +03:00
950f7ae3cf Doceditor: downgrade sass 2024-03-22 13:10:05 +03:00
1e7c92da9e Doceditor:Styles: fix font for dialogs 2024-03-21 16:23:57 +03:00
85799c8dd0 Client: PortalSettings: JavascriptSDK: Added style for CodeBlock component 2024-03-18 14:44:33 +03:00
342bd424ee Merge branch 'release/v2.5.0' into feature/sdk-code-block 2024-03-17 15:48:03 +03:00
7141573bd2
Merge pull request #311 from ONLYOFFICE/feature/update-react-toastify
feature/update-react-toastify
2024-03-15 18:32:42 +04:00
e44aabeecc Doceditor: add onlyoffice-document-editor-react as file (temp fix double render) 2024-03-15 16:56:55 +03:00
b0def506c6 Merge branch 'release/v2.5.0' into feature/update-react-toastify 2024-03-14 14:45:39 +05:00
215f4240a7 Update yarn.lock 2024-03-13 18:59:05 +04:00
a4df2a8cc6 Update version of react-toastify to v10.0.0 2024-03-13 14:27:52 +04:00
e3b60c1e23 Client: PortalSettings: Added base code block component 2024-03-12 12:27:12 +03:00
39ed74943b Doceditor: downgrade i18n and fix warnings 2024-03-04 10:49:43 +03:00
c7a1c6b60c Downgrade yarn to v4.0.2 (next-editor issue) 2024-03-01 13:40:58 +04:00
40a8db9d4c Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:00:55 +03:00
854c9ed627 Update yarn to v4.1.0 2024-02-29 11:25:02 +04:00