Viktor Fomin
|
4544621c41
|
fix after merge
|
2022-10-15 14:00:55 +05:00 |
|
|
|
8146e9aef4
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-15 13:43:10 +05:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
mushka
|
3c921c8cac
|
removed unused console.log
|
2022-10-02 02:41:14 +03:00 |
|
mushka
|
dcdfd239d8
|
creted new api call to get history from provided module
|
2022-09-26 10:37:57 +03:00 |
|
|
|
4f2763dda9
|
Web: Client: Added setInvitationLinks, resendEmailInvitations, getRoomSecurityInfo, setRoomSecurity and acceptInvitationByLink api actions
|
2022-09-22 18:10:07 +03:00 |
|
|
|
16feeaf988
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-21 14:00:17 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
ee2cb020ff
|
Web: Common: Api: Added getInvitationLinks, setInvitationLinks, resendEmailInvitations methods
|
2022-09-21 10:41:11 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
TimofeyBoyko
|
3c0bc5e500
|
Web:Common:API: fix filterValue at roomsFilter after page reload
|
2022-09-19 11:19:15 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
TimofeyBoyko
|
45675c5dc1
|
Web:Common:Api: add excludeSubject at files filter
|
2022-09-16 18:27:28 +03:00 |
|
TimofeyBoyko
|
65e04b76c8
|
Web:Common:Api: change withoutMe to excludeSubject at rooms filter
|
2022-09-16 17:34:17 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
ea49294f91
|
added getRoomHistory api call to api/rooms
|
2022-09-16 15:12:37 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
eeed96cb32
|
Web: Fixed bugs.
|
2022-09-15 15:58:21 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
ed18968601
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
# packages/client/public/locales/en/Settings.json
|
2022-09-14 01:45:01 +03:00 |
|
TimofeyBoyko
|
ccf9386c8e
|
Web:Common:Api: fix files filter
|
2022-09-12 12:26:37 +03:00 |
|
TimofeyBoyko
|
492d1bd682
|
Web:Common:Api: add searchInContent for file filter
|
2022-09-12 11:52:55 +03:00 |
|
|
|
478af8492d
|
Web:Common:Add data in methods setAdditionalResources.
|
2022-09-10 20:44:22 +03:00 |
|
mushka
|
9e8d5433d4
|
fixed getRoomMethod api call
|
2022-09-09 13:54:36 +03:00 |
|
|
|
f0bf37760b
|
Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources.
|
2022-09-09 10:34:45 +03:00 |
|
mushka
|
05fbe1bd7e
|
changed for-dev console.logs
|
2022-09-08 04:33:21 +03:00 |
|
mushka
|
b2caacc54b
|
added new api callout for getting room memebers
|
2022-09-06 23:36:59 +03:00 |
|
|
|
d25a3f143d
|
Web: Added sending a request to the sales department.
|
2022-09-05 13:48:32 +03:00 |
|
|
|
476ed95664
|
Web: Information from the new api was used.
|
2022-09-05 13:17:44 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
1116843315
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
|
2022-09-02 01:25:30 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
|
|
849591813d
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 15:53:14 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03:17 +03:00 |
|
|
|
e0c1acf111
|
Web: Added features.
|
2022-08-30 16:29:53 +03:00 |
|
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +03:00 |
|
TimofeyBoyko
|
b737830e69
|
Web:Common:Api: delete useless code
|
2022-08-30 11:57:06 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
60086b1a68
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-30 09:04:22 +03:00 |
|
|
|
38b217d65e
|
Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state
|
2022-08-30 08:55:19 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
bc14356351
|
Web: Added currencies.
|
2022-08-29 17:46:43 +03:00 |
|
