|
|
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
|
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 |
|
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
|
9b9b20a493
|
Web: Client: Add showing groups in members panel. Add members search/
|
2024-02-13 18:50:56 +01:00 |
|
|
|
eaf83a10d4
|
Web: Client: Add inviting groups to room
|
2024-02-13 16:53:24 +01:00 |
|
|
|
b92f8251f4
|
Web: Files: InvitePanel: fixed user rights
|
2024-02-08 18:04:46 +03:00 |
|
|
|
d596b06477
|
Web: Client: fixed the soapy image in the profile preview
|
2024-02-08 16:00:40 +05:00 |
|
|
|
07c1d4372c
|
Merge pull request #212 from ONLYOFFICE/feature/rewrite-stores
Feature/rewrite stores
|
2024-02-07 18:29:30 +04:00 |
|
|
|
7ca44dd09e
|
Shared: API: delete useless
|
2024-02-07 15:52:55 +03:00 |
|
|
|
a7be3428bb
|
Fixed after merge.
|
2024-02-06 16:13:16 +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 |
|
|
|
50749cb6f5
|
Web: Fixed api types.
|
2024-02-06 10:08:12 +03:00 |
|
|
|
c2431cc9f2
|
Merge branch 'feature/refactoring-auth-store' into feature/rewrite-stores
|
2024-01-30 09:32:51 +03:00 |
|
|
|
9a3279c6d7
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-30 09:32:03 +03:00 |
|
|
|
4abcf1e88c
|
Restore enable third-party switch
|
2024-01-29 21:07:45 +04:00 |
|
|
|
d34f1c9e33
|
Restored third-parties api methods
|
2024-01-29 21:07:00 +04:00 |
|
|
|
004818d522
|
Client:Store:Wizzard: rewrite to typescript
|
2024-01-29 16:23:37 +03:00 |
|
|
|
6d61917078
|
Client:Store:Payment: rewrite to typescript
|
2024-01-29 14:05:12 +03:00 |
|
|
|
a67ee43801
|
Shared:API:Plugins: rewrite to typescript
|
2024-01-29 13:07:28 +03:00 |
|
|
|
1a8865e9fb
|
Web: Added quota setting for the portal.
|
2024-01-29 11:37:14 +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 |
|
|
|
969d9ccbb5
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-26 12:11:14 +03:00 |
|
|
|
d17292bc12
|
Fix after merge 'develop'
|
2024-01-25 17:54: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 |
|
|
|
a3c039f731
|
Shared:Store:PaymentQuotasStore: move from common, rewrite to typescript and update using without auth store
|
2024-01-24 15:12:59 +03:00 |
|
|
|
f77842b26f
|
Shared:Store:CurrentQuotaStore: rewrite to typescript
|
2024-01-23 18:13:44 +03: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 |
|
|
|
772ec79d99
|
Web: Files: Upload: moved chunkUploadCount to SettingsStore
|
2024-01-23 16:44:34 +03:00 |
|
|
|
b3629d1386
|
Shared:Store:TfaStore: move from common, rewrite to typescript and update using without auth store
|
2024-01-23 12:55:19 +03:00 |
|
|
|
541943a9f3
|
Shared:Store:UserStore: move from common, rewrite to typescript and update using without auth store
|
2024-01-23 12:19:03 +03:00 |
|
|
|
b9a34f8c4e
|
Shared: fix eslint and ts problems
|
2024-01-23 10:24:57 +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 |
|
|
|
387a4dd6be
|
Shared: API: Files: ts fix
|
2024-01-17 13:09:25 +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 |
|
|
|
fd20d07e6b
|
Shared: API: add new method
|
2024-01-16 12:21:42 +03:00 |
|
|
|
37398d6932
|
Shared: API: fix after merge
|
2024-01-15 18:20:37 +03:00 |
|
|
|
68d21efd61
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-15 18:13:12 +03:00 |
|
|
|
40ea337a93
|
Shared:API:Files: fix moveto
|
2024-01-15 14:47:38 +03:00 |
|
|
|
7a2709b1f6
|
Shared:Utils:Common\Api: move from common and rewrite to typescript
|
2024-01-14 09:13:04 +03:00 |
|
