mushka
|
7ea5907259
|
fixed resend invitations api call and implemented it in members view
|
2022-11-03 17:06:13 +03:00 |
|
mushka
|
bb16de4ed9
|
Merge branch 'develop' into feature/info-panel-update and solved merge conflict
|
2022-11-03 14:52:11 +03:00 |
|
TimofeyBoyko
|
3700193ddb
|
Web:Client:Accounts: fix managaer role at filter
|
2022-11-03 12:39:25 +05:00 |
|
mushka
|
c7603626f5
|
created new updateRoomMemberRole api callout
|
2022-10-31 18:27:03 +03:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +05:00 |
|
|
|
8375711b5c
|
Web: Client: InvitePanel: Fixed invitation links usage for rooms
|
2022-10-28 11:24:25 +03:00 |
|
|
|
c5ed1fd0da
|
Web: Client: Store: Added invite users action and api methods
|
2022-10-27 17:00:45 +03:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
Viktor Fomin
|
bc5458bd21
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-24 18:38:02 +05:00 |
|
Elyor Djalilov
|
cabc463451
|
Web:Client:ActiveSessions: added mobile view
|
2022-10-24 17:14:49 +05:00 |
|
TimofeyBoyko
|
30799fa082
|
Merge branch 'develop' into bugfix/files-context-menu
|
2022-10-24 14:09:25 +05:00 |
|
TimofeyBoyko
|
561cc3b550
|
Web:Common:API: fix archiveRoom method
|
2022-10-20 21:34:21 +05:00 |
|
|
|
9e0bc49c6f
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-20 15:04:54 +03:00 |
|
|
|
0d680dd005
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 11:36:22 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
|
|
1fac4168fe
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 11:02:59 +03:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
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 |
|
|
|
516cb91846
|
Web:Common:Add getGreetingSettingsIsDefault.
|
2022-10-14 17:27:14 +03:00 |
|
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
TimofeyBoyko
|
e3b4979daa
|
Web:Common:Api: update user roles
|
2022-10-11 16:07:36 +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 |
|
|
|
cee1eb8c6c
|
Web:Common:Add provider in filter.
|
2022-10-05 14:54:47 +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 |
|
|
|
79fa7815c4
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-21 14:48:28 +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 |
|
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18:22 +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 |
|
