Commit Graph

48910 Commits

Author SHA1 Message Date
76f6fa7405 Merge branch 'develop' into feature/ssr-confirm
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	public/locales/en/Common.json
2024-08-30 13:21:08 +04:00
2430b052fa Merge branch 'hotfix/v2.6.1' into develop 2024-08-30 13:11:09 +04:00
67e1bcaad1
Merge pull request #608 from ONLYOFFICE/bugfix/data-import
Web: Client: Data Import: fix styles
2024-08-30 13:04:31 +04:00
d08973ea41
Merge pull request #609 from ONLYOFFICE/feature/last-activity
added translations
2024-08-30 13:02:17 +04:00
70cf8fc8e5 Merge branch 'hotfix/v2.6.1' into feature/last-activity 2024-08-30 13:00:54 +04:00
1a9a2da99d
Merge pull request #574 from ONLYOFFICE/feature/display-file-extension
feature/display-file-extension
2024-08-30 12:56:42 +04:00
7e0cb53c69 Files: Theme: value of fileExstColor have been replaced with globalColor const 2024-08-30 12:55:46 +04:00
303bd8b2ac Login: change webpack rule for chunk name 2024-08-30 11:45:45 +03:00
6945694b2b Fixed Bug 69877 - ChunkLoadError: Loading chunk 636 failed when opening the Share window 2024-08-30 11:39:19 +03:00
88434416c8 Login:Src:Wizard: fix redirect 2024-08-30 11:53:49 +04:00
c865cae5d9 Merge branch 'develop' into feature/display-file-extension 2024-08-30 11:05:15 +04:00
dc6d51172d Login:Src:Components: change styles 2024-08-29 19:05:41 +04:00
7990e92e03 Login:Src:Utils: remove constant URL_LICENSE 2024-08-29 19:05:08 +04:00
e7f106d97b Login:App: add licenseUrl and termsConditionsComponent 2024-08-29 19:04:01 +04:00
78cdfc212e Shared:ApI:Settings: change TSettings type 2024-08-29 19:01:53 +04:00
3b2b73802e Merge branch 'develop' into feature/ssr-confirm 2024-08-29 18:01:36 +04:00
Akmal Isomadinov
88e282f5cb Client:Confirm Fixed error message 2024-08-29 18:08:28 +05:00
5beb406bfc Client:Components:EmptyContainer: fix property reading errors for roomsFolder object 2024-08-29 15:37:16 +04:00
e0b24bb626 Client: EditGroupMembersPanel: Remove useless check 2024-08-29 13:21:01 +02:00
fe6a063325 Client: EditGroupMembersPanel: Disable user-select 2024-08-29 13:14:38 +02:00
5be445082f added translations 2024-08-29 14:10:07 +03:00
facd1a456a Login:Confirm:ProfileRemoveForm: change page 2024-08-29 14:29:59 +04:00
ee7fe469b2 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/Home/Section/Body/TableView/sub-components/RecentRowData.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/TableStore.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
2024-08-29 14:27:18 +04:00
1914417508 Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-08-29 12:02:52 +03:00
698e1c6034 Fix Bug 69920 - Added the ability to display 2 numbers after a dot. 2024-08-29 12:02:06 +03:00
Vlada Gazizova
6400c71169 Client:Change translation Context to Location. 2024-08-29 11:55:00 +03:00
72303ef08a Web: Client: Data Import: fix styles 2024-08-29 13:51:30 +05:00
b15a633b55 Settings: changed order of Integration tabs 2024-08-29 12:23:52 +04:00
99e8c08397 Login:Src:Components: change styles 2024-08-29 12:12:30 +04:00
b4cb1cdadc Login:App:Wizard: add error handling 2024-08-29 12:11:33 +04:00
d7b4a03e13
Merge pull request #607 from ONLYOFFICE/feature/default-column-view
Feature/default column view
2024-08-28 20:00:22 +04:00
27496ebb60 Client: FilesSettingsStore: Add error handling for file management api requests 2024-08-28 17:44:42 +02:00
9ef1c6cd25 Merge branch 'hotfix/v2.6.1' into feature/default-column-view 2024-08-28 19:27:19 +04:00
ea9a0a9261
Merge pull request #606 from ONLYOFFICE/feature/EmailErrorMessage
edited translations
2024-08-28 19:26:35 +04:00
62c7d0d9aa Merge branch 'hotfix/v2.6.1' into feature/EmailErrorMessage 2024-08-28 19:25:35 +04:00
117c745eb3 Login:Src:Components: remove old TenantList component 2024-08-28 19:11:28 +04:00
d4e8cad7a3
Merge pull request #602 from ONLYOFFICE/feature/translations-quotas
Feature/translations quotas
2024-08-28 19:10:14 +04:00
5df69e64bf Login:Src:Components: move RegisterContainer 2024-08-28 19:09:04 +04:00
b578931b84 Login:App:TenantList: move client components and page styles 2024-08-28 19:08:20 +04:00
4e0982de91 Login:App:Consent: move client component 2024-08-28 19:07:10 +04:00
65f027d56e Login:App:Wizard: move client component and styles 2024-08-28 19:05:30 +04:00
c9c38f3594 Login:Components:GreetingContainer: move GreetingUserContainer 2024-08-28 19:03:37 +04:00
e75dc57a10 Translation: fix PasswordProtectedFiles issue 2024-08-28 18:59:10 +04:00
2253d871b1 Merge branch 'hotfix/v2.6.1' into feature/translations-quotas 2024-08-28 18:57:27 +04:00
1ec5c740f6 Login:App:Confirm: move client components and styles for pages 2024-08-28 18:55:38 +04:00
a58ad42ec5 edited ar 2024-08-28 17:21:05 +03:00
75c63c91b9 Merge branch 'feature/default-column-view' of github.com:ONLYOFFICE/DocSpace-client into feature/default-column-view 2024-08-28 17:47:30 +04:00
e08a799de5 Merge branch 'hotfix/v2.6.1' into feature/default-column-view 2024-08-28 17:47:18 +04:00
Vlada Gazizova
ced5170da4 Changed translation in alphabetical order. 2024-08-28 16:43:42 +03:00
efb66229de
Merge pull request #604 from ONLYOFFICE/feature/terms-condition
Feature/terms condition
2024-08-28 17:40:14 +04:00