Commit Graph

489 Commits

Author SHA1 Message Date
0bace3efe2 Icons:Replaced the storage management icon in the menu. 2024-04-19 12:03:40 +03:00
49cb4789f9 Enabled new language sr-Latn-RS 2024-04-16 13:02:44 +04:00
159eff6bbe Client: Shared: Selectors: Groups: Add 75px empty screen images for groups selector 2024-04-12 10:34:32 +02:00
2c224e00d0 Client: Shared: Selectors: Groups: Fix empty screen images 2024-04-12 10:25:19 +02:00
7e32763dff Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-05 15:54:34 +03:00
7671855f14 Web: Files: Public: fixed styles 2024-04-05 14:03:44 +03:00
9b5a62ee24 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-04 10:06:33 +03:00
40df0fe348 Web: Client: Groups. fixed empty screen svg 2024-04-03 18:10:33 +05:00
c847ef1545 Merge branch 'release/v2.5.0' into feature/logo-handler 2024-04-03 09:55:06 +03:00
d3f226f48a Shared: Tag: delete useless 2024-04-02 16:30:45 +03:00
fcd18f0742 Client: Logo from handler 2024-04-02 08:25:21 +03:00
Vladimir Khvan
11189a341a Web: Client: JavascriptSDK: hint images for options in dark mode were corrected 2024-03-26 14:35:06 +05:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Vladimir Khvan
3bb4447673 Web: Client: JavascriptSDK: hint images for options were corrected 2024-03-15 16:00:02 +05:00
Vladimir Khvan
471c1a1208 Web: Client: JavascriptSDK: viewer preset tile image was corrected 2024-03-15 15:58:50 +05:00
Vladimir Khvan
5e38e94e78 Web: Client: JavascriptSDK: viewer preset tile image was changed 2024-03-14 14:40:00 +05:00
82f32d8b0b Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/routes/portalSettings.js
#	packages/client/src/store/DialogsStore.js
2024-03-05 20:12:08 +05:00
84fc187a27 Merge branch 'develop' into feature/groups 2024-03-04 21:55:21 +04:00
a8c0fd36b1 Merge branch 'develop' into bugfix/sdk-presets 2024-03-04 20:57:09 +04:00
Vladimir Khvan
f5e4f141ae Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput 2024-03-04 20:57:50 +05:00
6458ed9c26 Merge branch 'develop' into feature/groups
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableItem.js
#	packages/client/src/store/GroupsStore.ts
2024-03-04 18:52:18 +04:00
f72d8af2b9 Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/client/src/store/index.js
#	public/locales/en/Common.json
2024-03-04 14:30:41 +04:00
718455ee09 Web: added xlsb icons 2024-03-01 15:37:04 +05:00
namushka
d4134fa09b merge develop + merge fix
Conflicts:
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableContainer.js
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
2024-03-01 02:18:24 +03:00
Vladimir Khvan
800a2945f6 Web: Client: JavascriptSDK: presets images were changed 2024-02-29 13:48:03 +05:00
95c2928f38 Merge branch 'develop' into feature/data-migration
# Conflicts:
#	packages/shared/components/table/sub-components/TableHeaderCell.tsx
2024-02-29 11:41:02 +04:00
acc19b269c Merge branch 'develop' into feature/groups
# Conflicts:
#	packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
2024-02-27 16:32:55 +01:00
Vladimir Khvan
abb8ee3464 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/public/locales/en/People.json
	packages/client/public/locales/en/Settings.json
	packages/client/public/locales/ru/People.json
	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
	packages/client/src/pages/PortalSettings/utils/settingsTree.js
	packages/client/src/store/index.js
	packages/shared/enums/index.ts
	packages/shared/themes/base.ts
	packages/shared/themes/dark.ts
2024-02-27 14:51:49 +05:00
15ddf95e3b Merge branch 'develop' into feature/invite-page-redesign 2024-02-26 20:49:56 +04:00
bfc6767c02 renamed form gallery error image 2024-02-26 20:24:30 +05:00
7392fc08cd added custom error images 2024-02-26 20:20:14 +05:00
412765e3af Web: Icon added, styles corrected. 2024-02-26 12:49:37 +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
namushka
fdac12fc8b fixed icons 2024-02-20 12:48:58 +03:00
Vladimir Khvan
446be44db4 Merge branch 'develop' into feature/data-migration
Conflicts:
	public/locales/en/Common.json
2024-02-20 14:03:51 +05:00
d780557c2b Web: Client: Add new empty screen image to GroupsSelector 2024-02-16 14:55:19 +01:00
namushka
eadba5e683 merge origin + merge fix 2024-02-14 15:38:20 +03:00
namushka
b7a711c358 moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.) 2024-02-14 15:35:17 +03: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
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01:00
Vladimir Khvan
719ffe2b60 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/src/routes/portalSettings.js
	packages/client/src/store/DialogsStore.js
	packages/client/src/store/index.js
	packages/common/constants/index.js
	packages/components/file-input/index.js
	packages/components/paging/index.js
	packages/components/progress-bar/index.js
	packages/components/row/index.js
	packages/components/table-container/TableGroupMenu.js
	packages/components/themes/base.js
	packages/shared/api/settings/index.ts
	packages/shared/components/paging/Paging.styled.ts
	packages/shared/components/table/sub-components/TableHeaderCell.tsx
	packages/shared/utils/catalogIconHelper.ts
	public/locales/en/Common.json
2024-02-13 16:16:29 +05: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
498155bea3 Web: Client: JavascriptSDK: dark mode was added for manager 2024-02-02 15:17:27 +05:00
Vladimir Khvan
2bfd15a162 Merge branch 'develop' into feature/js-sdk-presets 2024-02-02 12:40:49 +05:00
Vladimir Khvan
8ec22671bf Web: Client: JavascriptSDK: dark theme was added for presets page 2024-02-01 18:52:05 +05:00
Vladimir Khvan
dcb4b3d276 Web: Client: JavascriptSDK: simple room was added 2024-02-01 13:46:45 +05:00
04a31c61d0 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/pages/Home/Section/Header/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 11:36:29 +03: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
e20ae17ab8 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/Sdk/index.js
#	packages/editor/src/client/components/Editor.js
#	packages/shared/selectors/Room/index.tsx
2024-01-30 18:33:56 +04:00
56c71f61af Web: Files: Public-room: fixed icon 2024-01-30 14:03:50 +03:00