|
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 |
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
05739c17b3
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-13 14:49:46 +03: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 |
|
Akmal Isomadinov
|
3cb31f417a
|
Merge branch 'develop' into feature/rewrite-error-boundary
|
2024-02-13 14:28:52 +05:00 |
|
|
f3ef4ce95c
|
Shared: Utils: add isHideBannerForUser
|
2024-02-12 19:00:22 +03:00 |
|
|
6465508729
|
Shared: init campaigns utils
|
2024-02-12 15:26:56 +03:00 |
|
|
ed3ec48e2a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-12 13:38:41 +03:00 |
|
|
399d4604ea
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-12 12:39:10 +03:00 |
|
|
4743a9b0f2
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-09 17:37:53 +03: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 |
|
|
e46207cf8b
|
Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components
|
2024-02-09 12:28:10 +03:00 |
|
Akmal Isomadinov
|
4541d4cdfa
|
Shared:Components:ReportDialog Rewrite to typescript
|
2024-02-09 14:07:14 +05:00 |
|
|
ed76251daf
|
Web: Shared: Utils: moved getUserTypeLabel to utilities
|
2024-02-09 13:15:18 +05:00 |
|
Akmal Isomadinov
|
17eec03a84
|
DocspaceLogo Rewrite to typescript
|
2024-02-08 20:35:53 +05:00 |
|
|
b92f8251f4
|
Web: Files: InvitePanel: fixed user rights
|
2024-02-08 18:04:46 +03:00 |
|
Akmal Isomadinov
|
f4d89afbf0
|
crashReport moved from client to shared
|
2024-02-08 19:13:57 +05:00 |
|
Akmal Isomadinov
|
16cb669a18
|
Shared:Utils:ClassNames Fixed type
|
2024-02-08 15:47:15 +05:00 |
|
|
ea5dd21226
|
Merge branch 'develop' into feature/oauth2-client
|
2024-02-08 13:02:07 +03:00 |
|
|
8409a6cee7
|
Merge branch 'develop' into feature/invite-panel-input
|
2024-02-07 19:33:11 +04:00 |
|
|
bf750053d8
|
Web: Files: InviteInput: fix
|
2024-02-07 16:13:35 +03:00 |
|
|
e288b8436c
|
Merge branch 'develop' into feature/rewrite-stores
# Conflicts:
# packages/client/src/pages/Home/MediaViewer/index.js
|
2024-02-07 12:13:15 +04:00 |
|
|
c346033713
|
Merge branch 'develop' into feature/oauth2-client
|
2024-02-07 10:20:15 +03:00 |
|
|
92e2adaa2f
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-06 21:55:59 +03:00 |
|
Akmal Isomadinov
|
1b508ba243
|
Shared: fixed cyclic dependency
|
2024-02-06 20:39:15 +05:00 |
|
|
a7be3428bb
|
Fixed after merge.
|
2024-02-06 16:13:16 +03:00 |
|
|
429d9545ab
|
Shared:Utils: delete console log
|
2024-02-06 12:14:25 +03:00 |
|
|
358a0904fc
|
Shared:Utils: fix axios client
|
2024-02-06 12:13:01 +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 |
|
|
aba82040b9
|
Shared:Selector:Files: fix bugs
|
2024-02-05 17:43:22 +03:00 |
|
|
72be9e6da7
|
Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
# packages/shared/package.json
|
2024-02-05 17:21:59 +04:00 |
|
|
182caeaaca
|
Shared:Utils:Common: fix convert to language function
|
2024-02-05 14:53:30 +03:00 |
|
Akmal Isomadinov
|
b0a792f3d7
|
MediaViewer: Optimization of tiff decoding
|
2024-02-04 19:08:01 +05:00 |
|
|
c9515e8fed
|
Doceditor: add support i18next
|
2024-02-02 18:41:50 +03: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 |
|
|
ebff35be27
|
Shared: fix after merge
|
2024-02-01 23:29:29 +03:00 |
|
|
6cec06c4c3
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-01 23:24:34 +03:00 |
|
Akmal Isomadinov
|
341dd8bbb2
|
Shared:Components:MediaViewer: Fixed style code
|
2024-02-01 14:18:06 +05:00 |
|
|
adbfd55004
|
Shared:Selectors:Files: add getIcon inside selector
|
2024-01-31 20:14:09 +03:00 |
|
Akmal Isomadinov
|
7ff2e88d3d
|
Shared:Components:MediaViewer: Optimization of working with tiff images
|
2024-01-31 21:16:23 +05:00 |
|
|
9bae37445d
|
Web: Fixed types.
|
2024-01-31 14:10:52 +03:00 |
|
|
ed91c37da3
|
Shared: Utils: rename
|
2024-01-31 01:48:25 +03:00 |
|
|
94eaa55676
|
Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors
|
2024-01-30 17:53:18 +03:00 |
|
|
79d2861d1a
|
Shared:Selectors:Files: move from client
|
2024-01-30 17:39:36 +03:00 |
|
|
7c88535748
|
Shared: Utils: fix, add get styles
|
2024-01-30 15:49:31 +03:00 |
|
Akmal Isomadinov
|
547a65be41
|
Shared:Components:MediaViewer:Player Refactoring, optimization and fixed types
|
2024-01-30 14:37:05 +05:00 |
|
Akmal Isomadinov
|
549ee18424
|
Shared: Fixed types
|
2024-01-29 19:34:52 +05:00 |
|
|
fae4d476d8
|
Web: Refactoring.
|
2024-01-29 15:16:50 +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 |
|
|
e7205ba278
|
Shared:Utils:Socket: update types
|
2024-01-26 19:36:15 +03:00 |
|
|
c17fd93574
|
Shared:Store:AuthStore: rewrite to typescript
|
2024-01-25 16:14:13 +03:00 |
|
|
6757092523
|
Shared:Store:SettingsStore: move from common and rewrite to typescript
|
2024-01-25 11:17:19 +03:00 |
|
|
f2b1e4d0a0
|
Merge branch 'feature/shared-article' into feature/refactoring-auth-store
|
2024-01-24 14:41:25 +03:00 |
|
|
d4756780fc
|
Web: Shared: Utils: removed unnecessary operations in combineUrl
|
2024-01-24 14:49:57 +05:00 |
|
|
429044ea05
|
Web: Shared: Utils: extended the combine url function to accept numbers
|
2024-01-24 14:09:50 +05:00 |
|
Akmal Isomadinov
|
b7b3860044
|
Fixed order of the rooms
|
2024-01-23 20:46:33 +05:00 |
|
Akmal Isomadinov
|
9f2ebab438
|
Shared: Added type guard
|
2024-01-23 20:46:17 +05:00 |
|
|
094a6421e6
|
Shared:Store:CurrentTariffStatusStore: move from common, rewrite to typescript and update using without auth store
|
2024-01-23 16:45:42 +03:00 |
|
|
b9a34f8c4e
|
Shared: fix eslint and ts problems
|
2024-01-23 10:24:57 +03:00 |
|
|
740996ca7e
|
Merge branch 'develop' into feature/oauth2-client
|
2024-01-22 10:11:13 +03:00 |
|
|
6ec3000fa8
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-22 10:03:42 +03:00 |
|
|
47ab8b82ab
|
Web: Fixed after merge.
|
2024-01-19 13:53:35 +03: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 |
|
|
eeede19a30
|
Merge branch 'develop' into feature/form-room-pdf
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/SettingsStore.js
# packages/common/constants/index.js
# packages/common/store/InfoPanelStore.js
# packages/components/room-logo/index.js
# packages/shared/utils/common.ts
|
2024-01-18 19:31:46 +04:00 |
|
|
f129e8f1dc
|
Client: fix after merge develop
|
2024-01-18 16:03:01 +03:00 |
|
|
16ada7a735
|
Client: fix after merge develop
|
2024-01-18 13:56:23 +03:00 |
|
|
a855f7b345
|
Merge branch 'develop' into feature/oauth2-client
|
2024-01-18 10:55:22 +03:00 |
|
|
144f673e17
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-17 15:58:33 +03:00 |
|
|
fc2e58d701
|
Shared:Selectors:People: rewrite to typescript and move from client
|
2024-01-17 11:53:48 +03:00 |
|
|
a9a8de4722
|
Shared:Selectors:Room: rewrite to typescript and move from client
|
2024-01-17 10:13:30 +03:00 |
|
|
441a7ba604
|
Merge branch 'develop' into bugfix/management-payments
# Conflicts:
# packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
# packages/shared/utils/convertTime.ts
|
2024-01-16 19:26:53 +03:00 |
|
|
5976642b65
|
Merge branch 'hotfix/v2.0.1' into develop
|
2024-01-16 12:34:15 +04:00 |
|
|
2e3fc63ecc
|
Merge branch 'develop' into feature/shared-navigation
|
2024-01-15 17:29:36 +04:00 |
|
|
f45a9df4b1
|
Shared:Components:DropDown: fix render
|
2024-01-15 14:44:49 +03:00 |
|
|
5231eb4116
|
Client: fix profile login crash and RoomsTypes values
|
2024-01-15 13:11:15 +03:00 |
|
|
c0db4a43e4
|
SHared:Components:Navigation: move from common and rewrite to typescript
|
2024-01-15 12:42:16 +03:00 |
|
|
7a2709b1f6
|
Shared:Utils:Common\Api: move from common and rewrite to typescript
|
2024-01-14 09:13:04 +03:00 |
|
|
7a3115a051
|
Shared:Utils:Firebase: rewrite to typescript and move from common
|
2024-01-12 10:44:46 +03:00 |
|
|
fd1b81bd16
|
Shared:Utils:Encoder: rewrite to typescript
|
2024-01-12 10:33:24 +03:00 |
|
|
c9eb637db9
|
Shared:Utils: rewrite to typescript
|
2024-01-11 16:38:53 +03:00 |
|
|
dca3f1b0a2
|
Shared:Utils:Helpers: rewrite to typescript
|
2024-01-11 15:49:51 +03:00 |
|
|
42d99efb87
|
Shared:Utils:IndexedDBHelper: rewrite to typescript
|
2024-01-11 14:56:42 +03:00 |
|
|
93bda924a7
|
Shared:Utils:CatalogIconHelper: move from common
|
2024-01-11 14:32:24 +03:00 |
|
|
24cab5966b
|
Shared:Utils:ImageFlags: move from common
|
2024-01-11 11:48:44 +03:00 |
|
|
ae23aaf0e2
|
Shared:Utils:MinifyJson: move from common
|
2024-01-11 11:28:42 +03:00 |
|
|
fc9b186a3a
|
Shared:Utils:Socket: rewrite to ts and move from common
|
2024-01-11 11:26:23 +03:00 |
|
|
bcf73df800
|
Shared:Utils:TryRedirectTo: rewrite to ts and move from common
|
2024-01-11 10:58:26 +03:00 |
|
|
4c0277c948
|
Shared:Utils:WhiteLabelHelper: rewrite to typescript and move from common
|
2024-01-11 10:46:56 +03:00 |
|
|
c77fda4f91
|
Client: fix warnings
|
2024-01-10 15:15:00 +03:00 |
|
|
ffdf08bbe2
|
Merge branch 'feature/components-typescript' into feature/common-utils-typescript
|
2024-01-10 14:09:20 +03:00 |
|
|
ef6f27ef66
|
Client: fix after rewrite to typescript
|
2023-12-29 17:29:35 +03:00 |
|
|
acca2fb761
|
Shared:Components:Utils: rewrite to typescript from common
|
2023-12-29 14:37:04 +03:00 |
|
|
1d2cabdc4e
|
Shared:Constants\Enums: move from common
|
2023-12-29 10:06:37 +03:00 |
|
|
0b3ce31756
|
Client: fix after rewrite to typescript
|
2023-12-27 17:45:22 +03:00 |
|
|
e2daee7a10
|
Shared:Components:Table\ColorTheme: rewrite to typescript
|
2023-12-20 12:14:18 +03:00 |
|
|
83bf8f3025
|
Fix after merge 'develop'
|
2023-12-14 13:02:52 +03:00 |
|
|
db64b1a06f
|
Shared: fix imports
|
2023-12-06 21:11:14 +03:00 |
|
|
e9f3786ff0
|
Shared:Components:EmailInput: rewrite to typescript
|
2023-12-06 17:44:16 +03:00 |
|
|
2cca1a76e6
|
Shared:Utils: fix export
|
2023-12-04 10:00:35 +03:00 |
|
|
81c91cc246
|
Shared:Utils: fix typing
|
2023-11-30 12:21:07 +03:00 |
|
|
0533ba2cff
|
Shared: rewrite components to typescript
|
2023-11-24 19:35:40 +03:00 |
|
|
49b8dcbfc5
|
Shared:Utils:Email: fix types
|
2023-11-24 12:24:13 +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 |
|