|
|
08ee4a74f5
|
Shared:Utils:Common: fix types for createPasswordHash
|
2024-04-25 16:43:10 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
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 |
|
|
|
daa1f5c95a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-29 00:05:12 +03:00 |
|
|
|
d109696360
|
Merge pull request #284 from ONLYOFFICE/feature/invite-page-redesign
Feature/invite page redesign
|
2024-02-28 19:44:18 +04:00 |
|
|
|
6cb13bd589
|
Web: moved validatePortalName to shared
|
2024-02-28 19:16:33 +05:00 |
|
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
|
a1aa83ee4a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-26 14:29:58 +03:00 |
|
|
|
b5f706a635
|
Web: Fixed provider titles.
|
2024-02-26 11:53:11 +03:00 |
|
|
|
cd7805b4ca
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-26 11:16:55 +03:00 |
|
Akmal Isomadinov
|
c945e0f7b9
|
Shared:Utils:Common: fix export
|
2024-02-23 20:26:32 +05:00 |
|
Akmal Isomadinov
|
04ee2a4116
|
Shared:Utils:Common: Enabled form filling room
|
2024-02-23 20:22:46 +05:00 |
|
|
|
ef9ec57576
|
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
|
2024-02-22 22:31:26 +04:00 |
|
|
|
112fdb1839
|
Merge branch 'develop' into feature/ads-banner
# Conflicts:
# packages/shared/components/article/sub-components/SubmitToFormGalleryAlert.tsx
|
2024-02-22 20:05:26 +04:00 |
|
|
|
3aac4cd2fb
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-22 13:17:33 +03:00 |
|
Akmal Isomadinov
|
4c11e86c37
|
Shared:Utils:Common: Disable form filling room
|
2024-02-22 13:37:23 +05:00 |
|
|
|
ae1dcebff6
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-22 10:53:18 +03:00 |
|
|
|
75b5716dcc
|
Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager
|
2024-02-22 10:00:47 +03:00 |
|
|
|
3fa4ecfdb7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 23:37:40 +03:00 |
|
