|
|
3b2b73802e
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-29 18:01:36 +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 |
|
Vlada Gazizova
|
6400c71169
|
Client:Change translation Context to Location.
|
2024-08-29 11:55:00 +03:00 |
|
|
|
9ef1c6cd25
|
Merge branch 'hotfix/v2.6.1' into feature/default-column-view
|
2024-08-28 19:27:19 +04:00 |
|
|
|
2253d871b1
|
Merge branch 'hotfix/v2.6.1' into feature/translations-quotas
|
2024-08-28 18:57:27 +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 |
|
Vlada Gazizova
|
173973cf59
|
Client:Table:In rooms, the Modified column has been replaced with Last Activity, and in the sort column, Last Modified Date has been replaced with Last Activity Date.
|
2024-08-28 16:17:41 +03:00 |
|
|
|
66c8f99046
|
Merge branch 'hotfix/v2.6.1' into bugfix/upload-quota
|
2024-08-28 17:00:05 +04:00 |
|
|
|
a3707f7f50
|
Translations: fix WrongTranslationVariablesTest issues
|
2024-08-28 16:43:14 +04:00 |
|
|
|
bf6108e9ee
|
Merge branch 'hotfix/v2.6.1' into feature/translations-quotas
|
2024-08-28 16:20:18 +04:00 |
|
|
|
f61b262c0d
|
Shared: OperationContainer: Added logo for dark theme
|
2024-08-28 10:10:53 +03:00 |
|
|
|
40626da6f2
|
Fix Bug 69825 - Settings:QuotaPerRoom. Added dialog about exceeding quota during upload
|
2024-08-27 14:15:02 +03:00 |
|
|
|
675449477d
|
added de, ja
|
2024-08-27 12:00:59 +03:00 |
|
|
|
4a0e4dc7ac
|
added translations
|
2024-08-27 11:50:33 +03:00 |
|
|
|
00e2ada86a
|
added translations
|
2024-08-26 20:07:13 +03:00 |
|
|
|
416eecc21b
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-26 11:33:16 +04:00 |
|
|
|
11fe4f4942
|
Merge branch 'develop' into feature/new-empty-screen
# Conflicts:
# packages/client/src/components/EmptyContainer/index.js
# public/locales/en/Common.json
|
2024-08-23 20:48:21 +04:00 |
|
|
|
1b6d4fb103
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/package.json
# packages/shared/themes/base.ts
# yarn.lock
|
2024-08-23 20:41:35 +04:00 |
|
Akmal Isomadinov
|
5995b8c8e0
|
Client:EmptyScreenGroups Added new empty screen for groups
|
2024-08-23 18:29:09 +05:00 |
|
|
|
e21ecd0f3e
|
Merge branch 'hotfix/v2.6.1' into bugfix/about-license
|
2024-08-22 16:58:58 +04:00 |
|
|
|
5366f41f37
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-22 16:26:54 +04:00 |
|
|
|
10b0b1ae54
|
Client:Public:Locales: remove translation SignIn
|
2024-08-22 15:45:19 +04:00 |
|
|
|
b2fc06a201
|
Translations: Fix ForbiddenValueElementsTest issue
|
2024-08-22 15:23:36 +04:00 |
|
|
|
3cae2e01ae
|
Merge branch 'hotfix/v2.6.1' into feature/translations-quotas
|
2024-08-22 15:18:11 +04:00 |
|
|
|
bcd30b5431
|
added hy
|
2024-08-22 13:07:06 +03:00 |
|
Akmal Isomadinov
|
f593055dc9
|
Images:EmptyView Fixed icon size
|
2024-08-22 14:55:05 +05:00 |
|
|
|
3dd14ccd49
|
Merge branch 'develop' into feature/new-empty-screen
|
2024-08-22 12:31:27 +04:00 |
|
|
|
e9f5327d7c
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/shared/components/room-icon/index.tsx
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
# packages/shared/themes/globalColors.ts
|
2024-08-22 12:29:56 +04:00 |
|
|
|
718c2dc338
|
Client:Public:Locales: add translation SignIn
|
2024-08-22 12:01:41 +04:00 |
|
|
|
c37e297ca4
|
Web: add translate
|
2024-08-21 23:16:01 +03:00 |
|
|
|
e0b5b6b632
|
added zh
|
2024-08-21 16:43:18 +03:00 |
|
|
|
62d4814ead
|
Fixed Bug 69784: JS-SDK: Added file flag for shared files at editor and viewer modes
|
2024-08-21 14:20:36 +03:00 |
|
|
|
c6bb0dbffe
|
added ja, ru
|
2024-08-21 12:36:27 +03:00 |
|
Akmal Isomadinov
|
05efe67fdc
|
Client:AccountsBody:EmptyScreen Added new empty screen for group
|
2024-08-20 20:59:22 +05:00 |
|
|
|
91f7292676
|
Web: Files: Fixed ThirdPartyComboBox
|
2024-08-20 15:06:31 +03:00 |
|
|
|
1d05a0aa9a
|
edited variable, added ro, pt-BR, de, fr, it, es
|
2024-08-20 14:19:06 +03:00 |
|
Akmal Isomadinov
|
62cf485588
|
Merge branch 'develop' into feature/new-empty-screen
# Conflicts:
# packages/client/src/components/EmptyContainer/index.js
# packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js
# packages/client/src/store/ContextOptionsStore.js
|
2024-08-20 14:04:49 +05:00 |
|
|
|
556df6e20c
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
# packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/DialogsStore.js
# packages/shared/components/access-right-select/AccessRightSelect.tsx
|
2024-08-19 17:26:45 +04:00 |
|
|
|
189ae17034
|
Merge pull request #588 from ONLYOFFICE/feature/quota-limit
Feature/quota limit
|
2024-08-16 20:02:23 +04:00 |
|
|
|
ba31c8f94d
|
JS-SDK: Added check for onContentReady event exist in config
|
2024-08-16 16:28:33 +03:00 |
|
|
|
32180ce6e2
|
Shared: OperationContainer: Added OperationContainer component
|
2024-08-16 15:53:38 +03:00 |
|
|
|
3e9ead34a6
|
Merge branch 'hotfix/v2.6.1' into feature/quota-limit
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
|
2024-08-16 11:25:44 +03:00 |
|
Akmal Isomadinov
|
ac1b9f4e05
|
Client:Plugins Updated icon
|
2024-08-16 13:23:20 +05:00 |
|
|
|
aa06f53703
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-16 02:26:23 +04:00 |
|
|
|
c7178bde0e
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-15 19:02:58 +04:00 |
|
|
|
5b74dab00d
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-15 18:13:37 +04:00 |
|
|
|
d5a0dc915d
|
JS-SDK: Added onContentReady event
|
2024-08-15 16:07:20 +03:00 |
|
