Vladimir Khvan
|
dd4709806c
|
Merge branch 'develop' into bugfix/sdk-presets
Conflicts:
packages/client/public/locales/en/JavascriptSdk.json
|
2024-03-07 12:15:20 +05:00 |
|
Akmal Isomadinov
|
77e1bd3ce3
|
Shared:Components:EmptyView Added hover and press effect
|
2024-03-07 11:31:50 +05:00 |
|
Vladimir Khvan
|
2ca01e4770
|
Web: Client: JavascriptSDK: preview empty screen background was changed
|
2024-03-06 16:07:42 +05:00 |
|
|
8ce74c371a
|
Web: Client: Data import fixed styles
|
2024-03-06 12:56:30 +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 |
|
|
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 |
|
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 |
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
947df5b013
|
Web: Client: Fix group combobox colors
|
2024-02-29 15:14:04 +01: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 |
|
|
b4b679a8f1
|
Web: Client: Reset group combobox colors. Add dark theme
|
2024-02-26 18:32:05 +01:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
c4b510978f
|
Web: Client: Shared: Add dark theme to members search
|
2024-02-26 15:41:02 +01:00 |
|
|
dedfdc07b2
|
Web: Fixed styles.
|
2024-02-26 13:44:33 +03:00 |
|
|
412765e3af
|
Web: Icon added, styles corrected.
|
2024-02-26 12:49:37 +03:00 |
|
|
0aa90a614b
|
Web: Client: Shared: Add dark theme to accounts
|
2024-02-22 22:25:24 +01:00 |
|
|
ae1dcebff6
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-22 10:53:18 +03:00 |
|
|
1449f5ae1e
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-20 22:37:37 +04: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 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05:00 |
|
|
3a2f64049e
|
Web: Added social buttons group.
|
2024-02-20 11:17:16 +03:00 |
|
|
1ac244437a
|
Merge branch 'develop' into bugfix/rc-2.5.0
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
|
2024-02-20 12:15:26 +04:00 |
|
|
58907d0792
|
Shared: update types
|
2024-02-19 10:35:57 +03:00 |
|
|
d2ff42627b
|
Web: Client: Mobile. fixed styles audit trail and login history
|
2024-02-16 11:11:48 +05: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 |
|
|
1fe703a0c9
|
Web: Shared: Adapt avatar for groups
|
2024-02-13 16:20:57 +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 |
|
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 |
|
|
6c5f554ce9
|
Fixed Bug 66295 - Accounts. The text of the authorization buttons via social networks in the Firefox browser is cut off
|
2024-02-07 19:48:22 +05:00 |
|
|
8d30c93899
|
background color was taken from the themes
|
2024-02-06 21:00:09 +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
|
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 |
|
|
efeb9be315
|
Web: Files: Public-room: added navigation button, added new icons
|
2024-01-29 17:55:55 +03:00 |
|
|
da2dc3d410
|
Web: Fixed themes.
|
2024-01-29 08:04:44 +03:00 |
|
Vladimir Khvan
|
14a2fdde50
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/components/themes/base.js
|
2024-01-15 15:12:59 +05:00 |
|
|
7acb53afca
|
Merge branch 'develop' into feature/components-typescript
|
2023-12-27 18:17:52 +03:00 |
|
Akmal Isomadinov
|
33616777c7
|
Shared:components:Tooltip Fixed background color
|
2023-12-22 13:52:11 +05:00 |
|
|
e6535c07a9
|
Merge branch 'develop' into feature/components-typescript
|
2023-12-21 14:36:39 +03:00 |
|
|
505c914a3d
|
Merge branch 'develop' into feature/components-typescript
|
2023-12-19 10:40:56 +03:00 |
|
|
83bf8f3025
|
Fix after merge 'develop'
|
2023-12-14 13:02:52 +03:00 |
|
|
d4225849c1
|
Shared:Components:ComboBox: rewrite to typescript
|
2023-12-13 18:02:41 +03:00 |
|
|
db64b1a06f
|
Shared: fix imports
|
2023-12-06 21:11:14 +03:00 |
|
|
38d19eb0b4
|
Shared: refactoring and apply code guide style
|
2023-12-05 19:52:30 +03:00 |
|
|
41668689c2
|
Shared:Themes\Types: fix default theme typing
|
2023-11-29 17:07:00 +03:00 |
|
|
7b5df6161e
|
Shared: fix eslint warnings
|
2023-11-24 10:43:45 +03:00 |
|
|
5be7801fb9
|
Shared: init workspace, fix storybook, fix jest, add react-testing-library
|
2023-11-23 18:25:24 +03:00 |
|