Commit Graph

78 Commits

Author SHA1 Message Date
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
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
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
6071f140e8 Fix Bug 67078 2024-03-27 13:28:07 +03: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
91084ac9f8 Client: PortalSettings: Branding: Added enum types for inputs 2024-03-19 15:55:09 +03: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
a9380b879e Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/GlobalEvents/CreateEvent.js
#	public/locales/en/Common.json
2024-03-14 17:47:38 +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
e00f565eec Client:Article:MainButton Fixed parent room type 2024-03-13 15:55:55 +05:00
Akmal Isomadinov
5fad4f34b8 Client:Article:MainButton: Added form file selection actions 2024-03-13 15:24:41 +05:00
8c3aa58e93 Shared: Enums: Added UrlActionType enum 2024-03-11 21:59:56 +03:00
64f838a027 Fix Bug 66836 2024-03-11 17:59:33 +03:00
176d1c7f16 Merge branch 'develop' into feature/data-migration 2024-03-05 22:09:00 +04:00
82f32d8b0b Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/routes/portalSettings.js
#	packages/client/src/store/DialogsStore.js
2024-03-05 20:12:08 +05:00
3f6ed2e68e Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0 2024-03-05 16:37:24 +05:00