Commit Graph

1405 Commits

Author SHA1 Message Date
ef3b07707a edited fr 2024-02-21 18:19:59 +03:00
1749f5a9d0 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/PeopleStore.js
#	packages/client/src/store/index.js
#	packages/shared/api/people/filter.js
#	packages/shared/enums/index.ts
2024-02-20 19:43:27 +03:00
5752c6a0b6 Fix groups translations 2024-02-20 00:30:49 +04:00
44606c2813 Fix bad translations 2024-02-19 19:46:53 +04:00
namushka
b672c0579c translations update 2 + fixed insideGroup Department column 2024-02-19 17:41:44 +03:00
namushka
d796213a67 Translations update 2024-02-19 16:05:06 +03:00
namushka
f39f000d01 Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/panels/AddUsersPanel/index.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Submenu/index.js
# packages/client/src/routes/client.js
2024-02-16 13:40:01 +03:00
3380ea9318 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/helpers/enums.ts
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/TableStore.js
2024-02-15 12:08:27 +03:00
6980f088bd Merge branch 'develop' into bugfix/my-documents-share 2024-02-14 16:29:35 +04:00
405406d9e5 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/routes/portalSettings.js
#	public/locales/en/Common.json
2024-02-14 14:19:11 +03:00
3dc49cf352 Auto-refactoring of translations 2024-02-14 13:16:02 +04:00
5b28408a17 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/client/src/store/TableStore.js
#	packages/client/src/store/index.js
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/utils/common.ts
#	public/locales/en/Common.json
2024-02-14 12:15:32 +03:00
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01:00
6ff443de9a Merge branch 'develop' into bugfix/my-documents-share 2024-02-13 13:08:28 +03:00
88b0184a08 Merge branch 'develop' into bugfix/my-documents-share 2024-02-10 00:46:50 +03:00
Vladimir Khvan
137207b78b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-02-09 20:24:06 +05:00
d9b026c166 Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
#	packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
#	packages/client/src/components/panels/InvitePanel/sub-components/Item.js
2024-02-09 17:11:02 +03:00
86f6d1d596 edited Form template -> PDF Form 2024-02-09 15:32:55 +03:00
148c3f83f1 Client: add translate 2024-02-09 15:09:14 +03:00
44f4261478 Web: Files: InvitePanel: fixed addUser, fixed translation 2024-02-09 15:04:55 +03:00
d385474caa Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/GlobalEvents/CreateRoomEvent.js
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/MainBar/Bar.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/UsersStore.js
#	packages/client/src/store/index.js
#	packages/common/store/AuthStore.js
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/files/index.ts
#	packages/shared/api/files/types.ts
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/store/UserStore.ts
#	public/locales/en/Common.json
2024-02-06 11:52:52 +03:00
Vladimir Khvan
33b32c21a5 Merge branch 'develop' into feature/js-sdk-presets 2024-02-06 13:27:38 +05:00
708835adf9 Web: StorageManagement: Added link to help center. 2024-02-05 17:05:51 +03:00
Akmal Isomadinov
251de059f4 Merge branch 'develop' into feature/refactoring-media-viewer 2024-02-05 14:31:47 +05:00
e885c0485d Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/Home/Hooks/usePublic.js
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/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/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/zh-CN/Common.json
2024-02-02 16:15:04 +04:00
Vladimir Khvan
bb74cc4947 Web: Client: JavascriptSDK: translations were corrected 2024-02-02 16:25:35 +05:00
cf9f65b21f Web: Files: fixed empty-screen for public room 2024-02-02 13:11:17 +03:00
Vladimir Khvan
2bfd15a162 Merge branch 'develop' into feature/js-sdk-presets 2024-02-02 12:40:49 +05:00
Akmal Isomadinov
cb6b4d0a57 Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
#	packages/common/components/MediaViewer/sub-components/Viewer/index.tsx
2024-02-02 12:25:09 +05:00
Vladimir Khvan
81fd71cb5d Web: Client: JavascriptSDK: button view was added 2024-02-02 00:27:09 +05:00
Vladimir Khvan
5419548399 Web: Client: JavascriptSDK: modified translations / corrected margin 2024-02-01 19:13:21 +05:00
ee2f010de3 edited oform -> PDF form 2024-02-01 16:06:21 +03:00
Vladimir Khvan
dcb4b3d276 Web: Client: JavascriptSDK: simple room was added 2024-02-01 13:46:45 +05:00
Akmal Isomadinov
f550257a75 Client:public: Fixed doctype 2024-02-01 12:58:22 +05:00
Akmal Isomadinov
0b58025361 Removed script tiff.min 2024-01-31 21:28:47 +05:00
496e2de0d2 Fix Bug 65381 - Rooms. Public. Fixed opening files of unsupported formats. 2024-01-30 14:13:30 +03:00
c1d0bb9995 Web: Files: Public-room: fixed links row 2024-01-30 11:05:54 +03:00
0dc2f20a5a The correct translation was returned. 2024-01-30 09:05:43 +03:00
863027d874 Web: Added a banner when using the personal quota limit for administrators. 2024-01-30 09:02:19 +03:00
eac73ab174 Web: Added a banner with information on reaching the portal quota limit for standalone mode. 2024-01-30 08:35:30 +03:00
19e9079671 Web: Files: Public-room: fixed translations 2024-01-29 15:48:52 +03:00
683c628c28 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/common/components/Loaders/index.js
#	packages/shared/api/files/index.ts
#	public/locales/en/Common.json
2024-01-28 20:44:38 +03:00
Vladimir Khvan
56e669555d Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/common/components/Navigation/sub-components/control-btn.js
	packages/shared/components/navigation/Navigation.tsx
	packages/shared/selectors/Room/index.tsx
2024-01-23 16:38:55 +05:00
1adf6b3634 Merge branch 'develop' into feature/my-documents-share 2024-01-19 17:04:46 +04:00
Vladimir Khvan
a8f8c4c1ce Web: Client: JavascriptSDK: help buttons were added 2024-01-19 17:43:20 +05:00
968573ce02 Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
#	packages/components/toast/styled-toastr.js
2024-01-19 16:20:16 +04:00
1e0c383514 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/constants/index.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/components/combobox/index.js
#	packages/components/themes/base.js
#	packages/components/toggle-button/index.js
#	packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/people/filter.js
#	packages/shared/api/rooms/filter.js
#	packages/shared/utils/common.ts
#	yarn.lock
2024-01-19 11:32:34 +03:00
Vladimir Khvan
b1039c6cb6 Web: Client: JavascriptSDK: button customization was added to Room selector preset 2024-01-18 23:25:26 +05:00