|
|
7074d6d869
|
Shared:Enums: change ButtonKeys
|
2024-08-14 19:48:15 +04:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
|
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 |
|
Akmal Isomadinov
|
a75e8802e8
|
Merge branch 'release/v2.6.0' into feature/form-room
# Conflicts:
# packages/client/src/store/ContextOptionsStore.js
# packages/doceditor/public/locales/en/CompletedForm.json
|
2024-07-17 16:00:11 +05:00 |
|
Akmal Isomadinov
|
3bc91ad33b
|
Client: Fixed bug 69070
|
2024-07-17 15:11:49 +05:00 |
|
Akmal Isomadinov
|
cac08b9ab8
|
Client:Selector Added filter by PDF form
|
2024-07-16 15:51:04 +05:00 |
|
|
|
f1e6f79704
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/login/src/components/LoginForm/index.tsx
|
2024-07-12 11:11:05 +04:00 |
|
|
|
f88093df6f
|
Shared: Enums: Removed FormTemplates from FilesSelectorExtendedFilterTypes
|
2024-07-11 17:46:12 +03:00 |
|
|
|
2d92a5be59
|
Shared: Fixed FilterType enum
|
2024-07-11 17:38:12 +03:00 |
|
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
|
6145817cb8
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-18 13:12:53 +03:00 |
|
Akmal Isomadinov
|
1b99bc534f
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-18 14:44:51 +05: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 |
|
Akmal Isomadinov
|
4d5cb413b0
|
Shared:Enums: Fixed order room type
|
2024-06-17 14:24:26 +05:00 |
|
|
|
0d1f71e14c
|
Renaming.
|
2024-06-14 13:25:48 +03:00 |
|
|
|
b7fbb88185
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-14 12:32:13 +03: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 |
|
|
|
c948f377f1
|
Accounts: change pending status and translation
|
2024-06-13 16:22:52 +04:00 |
|
|
|
83aa877b74
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-13 10:40:17 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05: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 |
|
|
|
e2dfd760be
|
Accounts: Filter: Change filtration status to EmployeeStatus totally (+new pending)
|
2024-06-10 23:23:30 +04:00 |
|
|
|
0fc19070dc
|
Login: add recaptcha component
|
2024-06-06 16:12:25 +03:00 |
|
|
|
d6605e6312
|
Shared: fix typo
|
2024-06-05 12:28:17 +03:00 |
|
|
|
54377c71c2
|
LDAP: Applied last style changes for CertificateDialog
|
2024-05-31 16:40:30 +04:00 |
|
Akmal Isomadinov
|
bf4cf3a495
|
Client: Added the creation of a room from a pdf form
|
2024-05-29 16:48:03 +05:00 |
|
|
|
e9d75eb71e
|
LDAP: Added 2 separated progresses for operations
|
2024-05-28 19:18:16 +04:00 |
|
|
|
996c79d617
|
Revert "Merge branch 'develop'"
This reverts commit da29dab3bf.
|
2024-05-28 14:05:49 +03:00 |
|
|
|
da29dab3bf
|
Merge branch 'develop'
|
2024-05-28 14:04:24 +03:00 |
|
|
|
3bb3c7d5ea
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-23 18:23:05 +03:00 |
|
|
|
f900585de5
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-15 18:36:42 +04:00 |
|
|
|
247cc04924
|
Fixed Bug 67937 - Files.Trash.Search. Error ‘Request failed with status code 400’ when selecting a room based on a third-party storage in the Search options panel.
|
2024-05-14 13:10:25 +03:00 |
|
Vladimir Khvan
|
8c8bd5a910
|
Web: Client: JavascriptSDK: reworked file selector's type selection
|
2024-04-30 01:47:49 +05:00 |
|
|
|
1ab2c02025
|
Merge branch 'develop' into feature/sdk-presets
# Conflicts:
# public/locales/en/Common.json
|
2024-04-26 16:40:45 +04:00 |
|
|
|
86e35787fc
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-23 13:59:33 +04:00 |
|
|
|
2205065fc0
|
Fixed Bug 67556 - Files.Hotkeys. Closing the Copy/Move to panels using Esc does not work.
|
2024-04-23 12:41:11 +03:00 |
|
Vladimir Khvan
|
45e3133382
|
Merge branch 'develop' into feature/sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
|
2024-04-23 14:05:15 +05:00 |
|
|
|
d2733829e5
|
Merge branch 'release/v2.5.0' into develop
|
2024-04-19 19:10:43 +04:00 |
|
|
|
fa2edc960b
|
Bug 67553 - Files.Quota. ‘Something went wrong.’ on the page when trying to create a form template from a gallery or text file if the user quota is exceeded.
|
2024-04-19 14:17:03 +03:00 |
|
Vladimir Khvan
|
f9589b6f83
|
Merge branch 'develop' into feature/sdk-presets
|
2024-04-15 14:23:23 +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 |
|
|
|
d47acaeda2
|
Client/Shared: added a filter for rooms in storage management settings.
|
2024-04-11 15:32:32 +03:00 |
|
Vladimir Khvan
|
9984a02ce7
|
Merge branch 'develop' into feature/sdk-presets
Conflicts:
packages/shared/enums/index.ts
packages/shared/selectors/Files/FilesSelector.types.ts
packages/shared/selectors/Files/hooks/useFilesHelper.ts
|
2024-04-09 15:07:00 +05:00 |
|
|
|
76c29e1335
|
Merge branch 'develop' into feature/form-room-modals
|
2024-04-08 01:39:14 +04:00 |
|
|
|
820da7bb80
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/SelectedFolderStore.ts
# packages/doceditor/src/app/create/page.tsx
|
2024-04-04 11:15:24 +04:00 |
|
Vladimir Khvan
|
6fe945fec8
|
Web: Client: JavascriptSDK: available editing option was added to files selector / filtering options were added
|
2024-04-02 18:30:45 +05:00 |
|
Akmal Isomadinov
|
f25805efcb
|
Client:Dialogs:CreatedPDFFormDialog Added toast
|
2024-04-02 15:52:56 +05:00 |
|
|
|
c5d6489d7f
|
Doceditor: show access denied and file not found errors in doceditor
|
2024-04-02 09:47:50 +03:00 |
|
