Commit Graph

110 Commits

Author SHA1 Message Date
2559048563 Shared: Utils: Refactoring. 2024-05-27 18:16:21 +03:00
3c11ddfb3b Web: Renamed function. 2024-05-23 13:08:35 +03:00
3b59d01a80 Shared: Components: LanguageCombobox: New prop added. 2024-05-23 11:46:01 +03:00
011b4e8a1b Shared/Client: Added common function. 2024-05-23 09:06:13 +03:00
aae967468e Merge branch 'develop' into feature/language-combobox
# Conflicts:
#	packages/login/index.d.ts
#	packages/login/src/client/components/Login.tsx
#	packages/login/src/components/LoginForm/index.tsx
#	packages/login/src/server/lib/helpers/index.ts
#	packages/shared/utils/loginUtils.ts
2024-05-21 14:43:22 +03:00
b4acdd2b2f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 11:23:36 +04:00
d2fdf61750 Fix bug 67884 - Settings:Change quota. It is impossible to change the quota after bytes are converted to another value. 2024-05-08 12:51:44 +03:00
c2dee92e6a
Merge pull request #390 from ONLYOFFICE/feature/login-nextjs
Feature/login nextjs
2024-05-03 19:58:01 +04:00
0fa1ac4ec2 Web: Added getting indexes for the form gallery to restore supported language. 2024-04-26 10:43:28 +03:00
08ee4a74f5 Shared:Utils:Common: fix types for createPasswordHash 2024-04-25 16:43:10 +03:00
Akmal Isomadinov
4649a776d8 Merge branch 'develop' into feature/public-preview 2024-04-24 17:31:50 +05:00
111cf5b073 Web: Client/Shared: LanguageCombobox component logic has been simplified. 2024-04-24 15:14:51 +03:00
ba7cdcc1ea Login: delete transfered part 2024-04-24 13:49:53 +03:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
3990c6d001 Fix Bug 67516 - Rooms.Search.Tag. The tag is broken down character by character on the page when you select a search by tag. 2024-04-18 15:48:18 +04:00
d4f66f20de Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
#	packages/client/src/components/NavMenu/sub-components/header-unauth.js
#	packages/login/src/client/components/Login.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	packages/login/src/server/lib/helpers/index.ts
#	packages/shared/api/user/index.js
#	packages/shared/utils/common.ts
2024-04-18 11:52:48 +03:00
a16f9e1c80 Fix getObjectByLocation (zoom download issue) 2024-04-17 20:10:04 +04:00
ddb9f74d83 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/doceditor/src/app/(root)/create/page.tsx
#	public/locales/en/Common.json
2024-04-12 19:14:59 +04:00
89046efd1a Merge branch 'release/v2.5.0' into bugfix/api-sdk 2024-04-11 14:15:59 +03:00
72cee98c40 Merge branch 'release/v2.5.0' into bugfix/api-sdk 2024-04-11 13:01:44 +03:00
52c15d0d97 Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5 2024-04-11 13:35:15 +04:00
5b67fbeb5d Translations: Fix EnDublicatesByContentTest issue (ProviderSso replaced to SSO) 2024-04-11 13:10:18 +04:00
2d1a370232 Shared:Utils:Common: fix typing for getUserRole and getUserType 2024-04-11 10:55:51 +03:00
6fdf88d782 JS-SDK: Control existing frameId 2024-04-10 12:44:42 +04:00
b1e363fcbf Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/pages/Home/Section/Header/index.js
2024-04-08 01:20:28 +04:00
385c1c4d0f Shared: Common: Fixed default favicon path 2024-04-02 12:50:29 +03:00
fcd18f0742 Client: Logo from handler 2024-04-02 08:25:21 +03:00
09bdc7e382 Merge branch 'release/v2.5.0' into develop 2024-03-26 14:38:57 +04:00
3f715e902b Web: Shared: fixed URI malformed 2024-03-26 13:49:40 +05:00
027646f8ea Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/doceditor/src/app/global-error.tsx
#	packages/doceditor/src/components/Root.tsx
#	packages/doceditor/src/hooks/useUpdateSearchParamId.ts
#	packages/doceditor/src/utils/actions.ts
#	packages/doceditor/src/utils/index.ts
2024-03-22 16:20:48 +04:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
043f584109 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
2024-03-18 14:55:42 +04:00
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Akmal Isomadinov
bbd173d4a0 Client: Added public preview 2024-03-14 17:54:21 +05:00
ecd7b776da Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
#	packages/login/src/client/components/Login.tsx
#	packages/shared/utils/common.ts
2024-03-13 19:02:04 +03:00
Akmal Isomadinov
fe1ace1795 Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
#	public/locales/en/Common.json
2024-03-13 16:38:57 +05:00
Akmal Isomadinov
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +05:00
2c5c39114c Shared: fix some typescript errors 2024-03-06 12:37:13 +03:00
b0a94d1629 Shared: fix eslint errors and warnings 2024-03-06 11:45:42 +03:00
91bf74e5af Merge branch 'develop' into feature/language-combobox
# Conflicts:
#	packages/login/src/client/components/Login.tsx
#	packages/shared/utils/common.ts
2024-03-05 09:54:29 +03:00
b3d082fbf3 Merge branch 'develop' into bugfix/public-room-media-viewer 2024-03-04 18:58:33 +04:00
3ab3ac5c33 Fix doceditor build 2024-03-04 17:39:02 +04:00
Akmal Isomadinov
1e0d6e89ab Merge branch 'bugfix/rc-2.5.0' into bugfix/public-room-media-viewer
# Conflicts:
#	packages/shared/utils/common.ts
2024-03-04 17:28:50 +05:00
Akmal Isomadinov
2a9fa214dd Client:PublicRoom Fixed preview in the public room 2024-03-04 17:14:33 +05:00
582f95162d Web: Added language support for login page. 2024-03-04 13:33:18 +03:00
Akmal Isomadinov
653ca4fb44 Client:PublicRoom: Fixed a redirection error when reloading a page in the media viewer 2024-03-04 15:18:43 +05:00
305630513f Web: moved parseDomain to shared 2024-03-01 19:43:50 +05:00
8261228759 Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:08:07 +03:00
40a8db9d4c Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:00:55 +03:00