Commit Graph

2150 Commits

Author SHA1 Message Date
5366f41f37 Merge branch 'develop' into feature/ssr-confirm 2024-08-22 16:26:54 +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
38e17d813d Fix Bug 69791
Don't display favicon in Safari
2024-08-21 15:55:26 +03: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
ee6df901ac Fix Bug 69732 - [LDAP] User quota field does not work in LDAP settings because quotas are disabled by default on the portal 2024-08-19 15:32:59 +04:00
f56aa1bb57 Client: Fixed translation. 2024-08-19 13:41:30 +03:00
b3a1ecbc00 Translations: fix UselessTranslationKeysTest issues 2024-08-16 19:56:45 +04:00
d6e0db9cc7 Translations: fix ForbiddenValueElementsTest issues 2024-08-16 19:53:25 +04:00
eee8dbe6e1 Merge branch 'hotfix/v2.6.1' into feature/quota-limit 2024-08-16 14:39:29 +04:00
Akmal Isomadinov
b952acaca9 Client: Fixed bug 69707 2024-08-16 15:20:33 +05: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
70c162f955 Refactoring. 2024-08-16 11:23:52 +03:00
cba322ba03 Client: Fixed translations. 2024-08-16 11:17:59 +03:00
910b4ebdf7 Client: Fixed translations. 2024-08-16 11:01:37 +03:00
e70099c09c Client: Added a banner when room and storage limits have been reached. 2024-08-16 10:59:47 +03:00
cf4795c278 Client: Upload files: styling password error + remove display duplicated toasts 2024-08-16 01:23:22 +04:00
b55dbdbb83 Client: Refactoring, added a dialogue for users if the limit is almost reached. 2024-08-15 21:58:05 +03:00
77c2736686 Client: Added a modal dialog when restoring a room if the limit is reached. 2024-08-15 19:07:23 +03:00
7df6e815ef Client: Added modal dialog after creating a room if the limit is almost exceeded. 2024-08-15 18:23:03 +03:00
1b63efadf8 Client: Deleted useless code. 2024-08-15 15:50:37 +03:00
ec0dbf9518 Client: Added dialogues if the limits for adding users and rooms have been reached. 2024-08-15 15:45:24 +03:00
1b4180e8cd Client: Deleted useless translation. 2024-08-15 10:21:57 +03:00
266fdabc75 Client: Updated room and storage bar when almost reaching the tariff limit. 2024-08-14 22:04:05 +03:00
5ab2fbeb15 Refactoring. 2024-08-14 17:06:39 +03:00
2ba823d7c8 Delete useless translations. 2024-08-14 17:03:15 +03:00
76c47dcedb Client: Updated bar for user and storage. 2024-08-14 16:37:10 +03:00
f2997597fe Client: Updated bar for storage tenant quota. 2024-08-14 15:36:41 +03:00
93dd41ff7e Client: Changed translation for personal quota. 2024-08-14 14:46:06 +03:00
5994561951 Client: Added banners when the storage limit for a tariff is reached. 2024-08-14 11:35:11 +03:00
e802809a84 Merge branch 'develop' into feature/ssr-confirm 2024-08-13 17:48:08 +04:00
92cf12621d Client: Added a bar for reaching the user limit by tariff. 2024-08-13 13:08:26 +03:00
eac9a93a2d Client: Changed translation for user tariff limit. 2024-08-13 11:03:32 +03: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
23ce60bc4b Fix Bug 69594 - [LDAP] User quota field in Attribute mapping section is not relevant to the configured server and has no units specified 2024-08-12 17:27:19 +04: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
fb9c0b015d Client:Packages:Public:Locales:Fix indent 2024-08-09 17:11:43 +04:00
28939339e0 Client:Public:Locales: remove Deactivate translation 2024-08-09 15:47:22 +04:00
dd1996b37b edited translations 2024-08-08 11:26:24 +03:00
b1cef0a131 Merge branch 'feature/update-langs_2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into feature/update-langs_2.6.1 2024-08-08 10:37:17 +03:00
81a7458921 edited de 2024-08-08 10:36:46 +03:00
5a541a02d2 Web: Client: Dialogs. WarningQuoataDialog. added tenant quota limit 2024-08-07 17:35:21 +05:00
26900a97c2 Translations: fix UselessTranslationKeysTest issue 2024-08-07 16:05:56 +04:00
560e57947f Merge branch 'hotfix/v2.6.1' into feature/update-langs_2.6.1 2024-08-07 15:59:24 +04:00
b56e6723b2 edited translations 2024-08-07 14:41:09 +03:00
9228080253 edited fi 2024-08-07 14:32:22 +03:00
665dc98870 added translations 2024-08-07 13:27:58 +03:00
d92d72061c Fixed Bug 69551 - Files.Info.History: Fixed "Documents" type in info panel 2024-08-07 12:46:30 +03:00