|
|
a639635c98
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/store/SettingsStore.ts
# public/locales/en/Common.json
|
2024-06-17 15:17:07 +04:00 |
|
|
|
b5bd0b21fa
|
Replacing two dots in a sentence, deleted useless code.
|
2024-06-14 14:30:47 +03:00 |
|
|
|
e0705efdbd
|
Fixed payment date.
|
2024-06-14 13:57:45 +03:00 |
|
|
|
e02d05c43f
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 12:19:34 +04:00 |
|
|
|
5593c4b655
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 11:27:02 +04:00 |
|
|
|
600d076f5c
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-14 09:52:15 +03:00 |
|
|
|
a72616801b
|
gs
# Conflicts:
# i18next/client.babel
# packages/client/public/locales/sr-Latn-RS/SMTPSettings.json
# packages/login/public/locales/en/Login.json
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 19:24:05 +04:00 |
|
|
|
e6bd7fbc63
|
Deleted useless settings parameter.
|
2024-06-13 15:04:49 +03:00 |
|
|
|
8af20b8e41
|
Shared:API:Settings: add maxUploadImageSize
|
2024-06-13 14:33:27 +03:00 |
|
|
|
3fb8f58206
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 11:28:33 +03:00 |
|
|
|
83aa877b74
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-13 10:40:17 +03:00 |
|
|
|
a78086c680
|
Shared: add captchaKey and captchaType for login
|
2024-06-13 10:38:15 +03:00 |
|
|
|
d1a1c9b477
|
Merge branch 'develop' into bugfix/standalone
# Conflicts:
# packages/client/public/locales/ar-SA/PaymentsEnterprise.json
# packages/client/public/locales/az/PaymentsEnterprise.json
# packages/client/public/locales/bg/PaymentsEnterprise.json
# packages/client/public/locales/cs/PaymentsEnterprise.json
# packages/client/public/locales/de/PaymentsEnterprise.json
# packages/client/public/locales/el-GR/PaymentsEnterprise.json
# packages/client/public/locales/en/PaymentsEnterprise.json
# packages/client/public/locales/es/PaymentsEnterprise.json
# packages/client/public/locales/fi/PaymentsEnterprise.json
# packages/client/public/locales/fr/PaymentsEnterprise.json
# packages/client/public/locales/hy-AM/PaymentsEnterprise.json
# packages/client/public/locales/it/PaymentsEnterprise.json
# packages/client/public/locales/ja-JP/PaymentsEnterprise.json
# packages/client/public/locales/ko-KR/PaymentsEnterprise.json
# packages/client/public/locales/lo-LA/PaymentsEnterprise.json
# packages/client/public/locales/lv/PaymentsEnterprise.json
# packages/client/public/locales/nl/PaymentsEnterprise.json
# packages/client/public/locales/pl/PaymentsEnterprise.json
# packages/client/public/locales/pt-BR/PaymentsEnterprise.json
# packages/client/public/locales/pt/PaymentsEnterprise.json
# packages/client/public/locales/ro/PaymentsEnterprise.json
# packages/client/public/locales/ru/PaymentsEnterprise.json
# packages/client/public/locales/si/PaymentsEnterprise.json
# packages/client/public/locales/sk/PaymentsEnterprise.json
# packages/client/public/locales/sl/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/tr/PaymentsEnterprise.json
# packages/client/public/locales/uk-UA/PaymentsEnterprise.json
# packages/client/public/locales/vi/PaymentsEnterprise.json
|
2024-06-11 18:27:24 +03:00 |
|
|
|
e16ffcda06
|
Added ClientConfig.
|
2024-06-11 11:23:31 +03:00 |
|
|
|
a3c74828b8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
|
2024-06-10 23:42:36 +04:00 |
|
|
|
1197023bd6
|
Renaming the function to portalSettingsUrl name.
|
2024-06-10 21:27:26 +03:00 |
|
|
|
40dc2c1c1b
|
Added new constant.
|
2024-06-10 17:14:25 +03:00 |
|
|
|
6c83c3a044
|
Added Bonus page for Spaces. Added page redirection.
|
2024-06-06 16:37:00 +03:00 |
|
|
|
dc0cfee0b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 21:19:46 +04:00 |
|
|
|
1fa5d6c356
|
Web: Fixed quota socket with incorrect data
|
2024-05-27 16:56:00 +03:00 |
|
|
|
6aa6b0cfd4
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-06 20:08:13 +04:00 |
|
|
|
6a981df0de
|
LDAP: Fix imports
|
2024-04-27 17:54:30 +04:00 |
|
|
|
237bb490e8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/common/store/CurrentQuotaStore.js
# packages/shared/api/settings/index.ts
|
2024-04-27 17:24:21 +04:00 |
|
Akmal Isomadinov
|
165918c051
|
Merge branch 'develop' into feature/public-preview
|
2024-04-26 12:18:11 +05:00 |
|
Akmal Isomadinov
|
0d992feda1
|
Shared:Store:AuthStore Disabled other request
|
2024-04-25 18:42:24 +05:00 |
|
|
|
28fe556f28
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-25 14:24:00 +04:00 |
|
Akmal Isomadinov
|
166d612e15
|
Client: Fixed screen orientation angle
|
2024-04-25 14:17:47 +05:00 |
|
|
|
bb0267fe55
|
Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
|
2024-04-23 10:30:01 +04:00 |
|
Akmal Isomadinov
|
c5ebced780
|
Client:PortalSettings:Branding Fixed the infinite loader
|
2024-04-22 18:17:29 +05:00 |
|
|
|
e27bad8eae
|
Merge branch 'release/v2.5.0' into develop
|
2024-04-12 20:13:01 +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 |
|
|
|
b30eee5c34
|
Merge branch 'release/v2.5.0' into feature/error-container-logo
|
2024-04-12 12:03:57 +04:00 |
|
|
|
615ffa8709
|
Client/Shared: Removed header menu when showing an error for a public room.
|
2024-04-11 16:09:39 +03:00 |
|
|
|
63155dabc8
|
Shared: SettingsStore: Fixed isFrame calculate
|
2024-04-10 13:59:32 +03:00 |
|
|
|
f68db1622c
|
Merge branch 'develop' into refactoring/remove-personal
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/client/src/pages/About/AboutContent.js
|
2024-04-08 01:23:49 +04:00 |
|
|
|
26fbeb4626
|
Shared: Fixed getting portal logos on settings store init
|
2024-04-04 14:20:30 +03:00 |
|
|
|
e7c9430817
|
Web: Files: removed table logs
|
2024-04-03 17:08:29 +03:00 |
|
|
|
87432f9781
|
Fix Bug 65145: User with LTR portal culture and without own culture gets wrong portal direction if he logs in after user with RTL culture
|
2024-03-29 17:19:35 +01:00 |
|
|
|
9c1818010c
|
Fix crash on window.DocSpaceConfig is undefined
|
2024-03-28 16:32:05 +04:00 |
|
|
|
f14927927b
|
Web: Store: remove personal
|
2024-03-27 19:06:35 +05:00 |
|
|
|
8666c97257
|
Fix Bug 67092
|
2024-03-26 12:10:09 +03:00 |
|
|
|
4186917c5c
|
Client: PortalSettings: JavascriptSDK: Added help link for info bar
|
2024-03-26 10:52:44 +03:00 |
|
|
|
a5914c9649
|
Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0
|
2024-03-25 14:19:23 +03:00 |
|
|
|
c60663bcef
|
Web: Files: Table: added logs
|
2024-03-25 14:19:16 +03:00 |
|
|
|
6b9742931b
|
Client: PortalSettings: JavascriptSDK: Fixed error displaying for csp input
|
2024-03-25 14:13:42 +03:00 |
|
|
|
c9234fec72
|
Replaced copyright start year + format
|
2024-03-21 18:09:55 +04:00 |
|
|
|
c8c8010029
|
Fix bug 66939 - Settings: Spaces. "Resource cannot be found" after redirect to restore page.
|
2024-03-20 14:27:20 +03:00 |
|
|
|
f83ad53703
|
Shared: Store: SettingsStore: Reverted commit a249664b90
|
2024-03-20 11:58:17 +03:00 |
|
|
|
a249664b90
|
Shared: Store: SettingsStore: Added call inside DesktopEditor portal:icon for setting favicon on tab
|
2024-03-19 12:58:07 +03:00 |
|
|
|
11b4f67041
|
Shared: apply yarn eslint:fix
|
2024-03-18 12:54:09 +03:00 |
|
