Commit Graph

658 Commits

Author SHA1 Message Date
11da227257 Fix translation issues 2024-02-26 12:06:12 +03:00
3890aa323a edited es 2024-02-22 16:49:14 +03:00
e9d13a6452 Applied babelEdit auto-fixes 2024-02-22 13:22:16 +04:00
5f744636a5 Translations: move Files:CreateAndCopy to Common 2024-02-22 13:17:26 +04:00
c4d69493d9 Merge branch 'develop' into bugfix/selectors 2024-02-22 10:05:57 +03:00
ef3b07707a edited fr 2024-02-21 18:19:59 +03:00
560958351a Merge branch 'develop' into bugfix/selectors 2024-02-21 16:26:10 +03:00
eacad7f98f Move translation keys from GroupsSelector to Common 2024-02-21 16:12:14 +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
dfe05b707a Merge branch 'develop' into bugfix/selectors 2024-02-20 14:36:45 +03:00
5752c6a0b6 Fix groups translations 2024-02-20 00:30:49 +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
80684f33fa Merge branch 'develop' into bugfix/selectors 2024-02-19 11:52:55 +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
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
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +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
233f936876 Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors 2024-02-13 12:17:15 +03:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04: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
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
077a9e1cd5 edited NameSorting keys 2024-02-01 16:18:48 +03:00
ee2f010de3 edited oform -> PDF form 2024-02-01 16:06:21 +03:00
Vladimir Khvan
cdcffc31c9 Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/Home/Section/Header/index.js
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/shared/components/navigation/Navigation.tsx
	packages/shared/components/navigation/Navigation.types.ts
	packages/shared/components/navigation/sub-components/ControlBtn.tsx
2024-02-01 15:01:55 +05:00
Vladimir Khvan
40bf42d783 Web: Client: JavascriptSDK: filter description was added in file selector 2024-01-31 23:28:42 +05:00
9816f1743b Removed useless translation key 2024-01-31 21:08:26 +04:00
Vladimir Khvan
a8efee895b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/client/src/pages/Sdk/index.js
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-01-31 13:36:21 +05:00
9bc350628b Web: Added dialog for changing portal quota. 2024-01-29 13:15:22 +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
a47dd8345a Merge branch 'develop' into feature/new-tariff-bar 2024-01-26 14:59:38 +03:00
bbe974f548 Web: Added the ability to change quota. 2024-01-26 12:29:28 +03:00
Akmal Isomadinov
a12cbd3415 Shared:Components:Cron Refusal of transfers in favor of luxon 2024-01-25 19:42:22 +05:00
Akmal Isomadinov
a7f2c24393 Shared:Components:Cron Updated translation and deleted old translations 2024-01-24 18:36:12 +05: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
3d359b3d7f Web: Fixed translation. 2024-01-22 15:27:41 +03:00
cba0ca5d84 Merge branch 'develop' into feature/new-tariff-bar 2024-01-19 19:46:34 +03:00
253a8701f4 Web: Added quota change dialog in management section. 2024-01-17 11:50:48 +03:00
cc9af6d709 Web: add translate 2024-01-15 15:15:14 +03:00
6f2caccb70 Web: add translate 2024-01-13 00:05:22 +03:00
596a832dbe Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/public/locales/ru/Settings.json
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/PeopleStore.js
#	packages/common/api/files/index.js
#	packages/components/table-container/TableHeader.js
2024-01-10 12:25:13 +03:00
Vladimir Khvan
df2a6d3033 Web: Client: JavascriptSDK: manager preset was complemented 2023-12-25 16:25:47 +05:00
1b700299ee Merge branch 'develop' into feature/my-documents-share 2023-12-15 18:22:25 +03:00
cd453f81c0 Merge branch 'hotfix/v2.0.1' into develop 2023-12-15 18:52:31 +04:00
c051c75741 added rtl-keys 2023-12-15 14:42:38 +03:00