|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
32180ce6e2
|
Shared: OperationContainer: Added OperationContainer component
|
2024-08-16 15:53:38 +03:00 |
|
Akmal Isomadinov
|
b6374f020d
|
Web:EmptyContainer Added a empty screen for the filter
|
2024-08-15 16:24:22 +05:00 |
|
|
|
e802809a84
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-13 17:48:08 +04:00 |
|
|
|
0c48a11f07
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/login/src/app/(root)/page.tsx
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
|
2024-08-12 19:10:02 +04:00 |
|
|
|
1100804723
|
Merge branch 'hotfix/v2.6.1' into feature/quota-limit
|
2024-08-12 17:42:28 +03:00 |
|
|
|
2cfbca7d27
|
SSO: Moved ResetConfirmationModal to client components
|
2024-08-12 16:38:06 +04:00 |
|
|
|
b404c0eb15
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:51:42 +04:00 |
|
|
|
a2302aa248
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/Confirm/sub-components/activateUser.js
# packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js
# packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js
# packages/login/src/app/(root)/layout.tsx
# packages/login/src/app/(root)/page.tsx
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/types/index.ts
# packages/login/src/utils/actions.ts
# packages/shared/constants/index.ts
# packages/shared/themes/base.ts
|
2024-08-09 17:23:25 +04:00 |
|
|
|
ac5094c2ea
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:15:21 +04:00 |
|
|
|
65ded50972
|
Client:Public:Locales:Fix indent
|
2024-08-09 17:10:32 +04:00 |
|
|
|
101865503e
|
Client:Public:Locales: add Deactivate translation
|
2024-08-09 15:49:11 +04:00 |
|
|
|
3094409fa8
|
Client: Added a notification about how much the quota is exceeded when trying to invite a paid user.
|
2024-08-08 13:29:43 +03:00 |
|
|
|
dd1996b37b
|
edited translations
|
2024-08-08 11:26:24 +03:00 |
|
|
|
81a7458921
|
edited de
|
2024-08-08 10:36:46 +03:00 |
|
|
|
665dc98870
|
added translations
|
2024-08-07 13:27:58 +03:00 |
|
|
|
a5fb33ba7e
|
added translations
|
2024-08-06 17:07:50 +03:00 |
|
|
|
3df780c3c9
|
added translations
|
2024-08-06 13:37:18 +03:00 |
|
|
|
25f11b05c8
|
added translations
|
2024-08-05 18:40:08 +03:00 |
|
|
|
34a5785660
|
added translations
|
2024-08-05 15:25:46 +03:00 |
|
|
|
5c9a26987c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/api/rooms/index.ts
|
2024-08-05 15:37:22 +04:00 |
|
|
|
f47a65777b
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-05 15:35:03 +04:00 |
|
|
|
7c85b7038c
|
added translations
|
2024-08-02 18:50:28 +03:00 |
|
|
|
cd0fb0e4e0
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-08-02 17:34:28 +04:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
fd81e8e302
|
Merge branch 'hotfix/v2.6.1' into bugfix/65023
|
2024-08-02 16:56:14 +04:00 |
|
|
|
ab6f8a9e8a
|
Web: Doceditor: FilePassword: fixed text styles
|
2024-08-02 14:13:55 +03:00 |
|
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
|
21b585fc7e
|
Web: Shared: LinkRow: reworked link regeneration to link deletion
|
2024-08-01 17:28:02 +03:00 |
|
