|
|
116702d286
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
# packages/login/src/components/Invalid.tsx
|
2024-07-22 20:23:04 +04:00 |
|
|
|
c056f494ee
|
Shared: removed useless constant
|
2024-07-18 18:27:53 +04:00 |
|
|
|
205df2f68b
|
Rebranding: move organizationName to Common.json
|
2024-07-18 18:20:37 +04:00 |
|
|
|
b354c305cf
|
Add check for enable identity services
|
2024-07-09 15:39:14 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
adcc11094d
|
Copyright 2024
|
2024-03-18 03:13:02 +04:00 |
|
|
|
43d0a40120
|
Shared: SettingsStore: Added setting isFrame to DocSpaceConfig object
|
2024-03-15 16:42:28 +03:00 |
|
|
|
2ed5b02046
|
Shared: Store: SettingsStore: Added openUrl action
|
2024-03-11 21:59:24 +03:00 |
|
|
|
b0a94d1629
|
Shared: fix eslint errors and warnings
|
2024-03-06 11:45:42 +03:00 |
|
|
|
a1aa83ee4a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-26 14:29:58 +03:00 |
|
|
|
9e5bd64a6c
|
Shared: Store: SettingsStore: Moved insertTagManager method to common utils
|
2024-02-19 12:57:40 +03:00 |
|
|
|
81ba95ef9f
|
Shared: Store: SettingsStore: Added method to insert GTM scripts
|
2024-02-19 12:26:30 +03:00 |
|
|
|
4ba223f14b
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-12 18:50:23 +03:00 |
|
|
|
ed3ec48e2a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-12 13:38:41 +03:00 |
|
|
|
c71248484e
|
Client:Pages:DeleteData: fix page crush
|
2024-02-12 12:18:01 +03:00 |
|
|
|
2471ec04fb
|
Shared:Store: change init from object as to nullable
|
2024-02-12 12:04:01 +03:00 |
|
|
|
cff9066645
|
Fix confirm invite (password settings issue)
|
2024-02-08 18:57:31 +04:00 |
|
