|
9cc09bb00f
|
Added PortalAdmin key.
|
2024-06-10 20:40:58 +03:00 |
|
|
c8df2d9703
|
Merge branch 'develop' into feature/branding-correction
# Conflicts:
# packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
# packages/client/public/locales/az/CreateEditRoomDialog.json
# packages/client/public/locales/bg/CreateEditRoomDialog.json
# packages/client/public/locales/cs/CreateEditRoomDialog.json
# packages/client/public/locales/de/CreateEditRoomDialog.json
# packages/client/public/locales/el-GR/CreateEditRoomDialog.json
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/es/CreateEditRoomDialog.json
# packages/client/public/locales/fi/CreateEditRoomDialog.json
# packages/client/public/locales/fr/CreateEditRoomDialog.json
# packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
# packages/client/public/locales/it/CreateEditRoomDialog.json
# packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
# packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
# packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
# packages/client/public/locales/lv/CreateEditRoomDialog.json
# packages/client/public/locales/nl/CreateEditRoomDialog.json
# packages/client/public/locales/pl/CreateEditRoomDialog.json
# packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
# packages/client/public/locales/pt/CreateEditRoomDialog.json
# packages/client/public/locales/ro/CreateEditRoomDialog.json
# packages/client/public/locales/ru/CreateEditRoomDialog.json
# packages/client/public/locales/si/CreateEditRoomDialog.json
# packages/client/public/locales/sk/CreateEditRoomDialog.json
# packages/client/public/locales/sl/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/tr/CreateEditRoomDialog.json
# packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
# packages/client/public/locales/vi/CreateEditRoomDialog.json
# packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
|
2024-06-07 15:49:36 +03:00 |
|
|
3e80644009
|
Shared:Utils:MoveTranslations: init
|
2024-06-06 17:50:20 +03:00 |
|
|
d06690363d
|
Merge branch 'develop' into feature/branding-correction
# Conflicts:
# packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js
|
2024-06-03 13:30:09 +03:00 |
|
|
c0ee32f303
|
Added interpolation for 'DocspaceAdmin' key.
|
2024-05-30 13:13:43 +03:00 |
|
|
2723efb02b
|
Shared: Utils: Added checks.
|
2024-05-29 15:05:06 +03:00 |
|
|
c39fe6c943
|
Merge branch 'develop' into feature/language-combobox
|
2024-05-27 21:10:02 +04:00 |
|
|
2559048563
|
Shared: Utils: Refactoring.
|
2024-05-27 18:16:21 +03:00 |
|
|
d1061bb3ae
|
renaming resource keys
|
2024-05-23 18:14:33 +03:00 |
|
|
f299f6532d
|
Merge branch 'develop' into feature/language-combobox
# Conflicts:
# packages/login/src/app/(root)/page.tsx
# packages/login/src/components/Login/index.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/hooks/useI18N.ts
# packages/login/src/utils/actions.ts
|
2024-05-23 14:03:06 +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 |
|
|
07030faa8c
|
Client: Changed icon of My Documents
|
2024-05-22 13:51:38 +04: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 |
|
|
5430fcda99
|
Merge pull request #416 from ONLYOFFICE/bugfix/editor-internal-requests
Bugfix/editor internal requests
|
2024-05-17 17:54:23 +04:00 |
|
|
b7259b61de
|
Shared:Utils:NextSSRHelper: add flag for disable internal requests
|
2024-05-17 16:50:07 +03:00 |
|
Akmal Isomadinov
|
ed154cb0eb
|
Merge branch 'develop' into feature/layout
|
2024-05-17 14:16:40 +05:00 |
|
|
2f425bf005
|
Fix base url
|
2024-05-17 11:38:05 +03:00 |
|
|
bdab93673a
|
Shared:Utils: fix origin header for internal requests
|
2024-05-17 10:21:34 +03:00 |
|
|
22af34cf00
|
Remove internal requests
|
2024-05-16 17:16:18 +03:00 |
|
Akmal Isomadinov
|
aafc126f01
|
Merge branch 'develop' into feature/layout
|
2024-05-16 17:40:16 +05:00 |
|
|
dde29338f9
|
Shared:Utils:NextSSRHelper: remove useless console log
|
2024-05-16 11:13:40 +03:00 |
|
Akmal Isomadinov
|
1307183bde
|
Shared:Utils:useClickOutside Fixed types
|
2024-05-15 21:11:33 +05:00 |
|
|
78e8575f4c
|
Merge pull request #398 from ONLYOFFICE/feature/login-nextjs
Feature/login nextjs
|
2024-05-15 13:34:59 +04:00 |
|
|
9bd7bba894
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-13 19:03:34 +04:00 |
|
|
76187435df
|
Merge branch 'hotfix/v2.5.1' into bugfix/campaigns-banner
|
2024-05-13 18:25:06 +04:00 |
|
|
5aee9c9982
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-13 18:23:45 +04:00 |
|
|
bb7b865498
|
Web: Added si flag
|
2024-05-13 18:05:48 +04:00 |
|
|
b4acdd2b2f
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-13 11:23:36 +04:00 |
|
|
591dd630bc
|
Merge branch 'hotfix/v2.5.1' into bugfix/campaigns-banner
|
2024-05-08 17:22:54 +03:00 |
|
|
5b2a6744ab
|
Login: add logging for HOST_API
|
2024-05-08 16:52:02 +03: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 |
|
|
d8f9e5937c
|
Shared:Utils:NextSSRHelper: add API_HOST from env
|
2024-05-08 12:29:55 +03:00 |
|
|
58f0a4509f
|
Merge branch 'hotfix/v2.5.1' into bugfix/campaigns-banner
|
2024-05-06 15:20:49 +03:00 |
|
|
c2dee92e6a
|
Merge pull request #390 from ONLYOFFICE/feature/login-nextjs
Feature/login nextjs
|
2024-05-03 19:58:01 +04:00 |
|
|
4e1553d9be
|
Merge branch 'develop' into feature/public-preview
|
2024-05-03 15:36:07 +04:00 |
|
|
4f2295c2d8
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-03 14:51:27 +04:00 |
|
|
16350b4d50
|
Web: Shared: FilesSelector: fixed title
|
2024-05-03 13:08:38 +03:00 |
|
|
29f4b4be81
|
Shared: Utils: get campaign icon
|
2024-05-02 14:09:58 +03:00 |
|
|
1b19d2066f
|
Merge branch 'develop' into feature/login-nextjs
|
2024-05-02 13:56:50 +03:00 |
|
Akmal Isomadinov
|
9c9e8f4ad0
|
Merge branch 'develop' into feature/public-preview
|
2024-04-29 12:05:45 +05:00 |
|
|
d8bdba29b6
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-26 14:59:35 +04:00 |
|
|
e5a031dafa
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-26 13:51:53 +03:00 |
|
|
0fa1ac4ec2
|
Web: Added getting indexes for the form gallery to restore supported language.
|
2024-04-26 10:43:28 +03:00 |
|
Akmal Isomadinov
|
165918c051
|
Merge branch 'develop' into feature/public-preview
|
2024-04-26 12:18:11 +05:00 |
|
|
bbd0a4fba6
|
Merge pull request #382 from ONLYOFFICE/bugfix/chunk-upload
Shared:Utils:ComponentLoader: add page reload if loading chunk failed
|
2024-04-25 18:59:20 +04:00 |
|
|
08ee4a74f5
|
Shared:Utils:Common: fix types for createPasswordHash
|
2024-04-25 16:43:10 +03:00 |
|
|
fbb60df665
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-25 16:41:49 +03:00 |
|
|
db0c5ead40
|
Shared:Utils:ComponentLoader: add page reload if loading chunk failed
|
2024-04-25 16:17:18 +03:00 |
|