Commit Graph

60 Commits

Author SHA1 Message Date
Viktor Fomin
1904e3bc43 Fix Bug 63467: auth via Microsoft is not available 2023-08-29 06:26:37 +03:00
Akmal Isomadinov
a5669a14eb Web: Fixed upload indicator 2023-05-18 16:45:36 +05:00
Viktor Fomin
de4456f124 Common: Constants: add AccountLoginType 2023-05-17 13:07:59 +03:00
Akmal Isomadinov
194e49efde Web:Client Fixed bug 62171 2023-04-25 14:08:01 +05:00
Akmal Isomadinov
f72dd886ee Web:Client:Store Fixed bug 62140 2023-04-18 16:41:17 +05:00
e752574c57 Web: Added Zendesk live chat + refactoring 2023-04-04 00:46:59 +04:00
Viktor Fomin
fe28a6a3df Common: add redirect for deactivated portal 2023-03-30 11:34:25 +03:00
a4567c99dc Web: Hide room types FillingFormsRoom, ReviewRoom, ReadOnlyRoom 2023-03-16 11:57:28 +04:00
9a45dea8bd Web: Added opportunity to change wrongPortalNameUrl in config.json 2023-03-14 22:31:43 +04:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Timofey Boyko
f4f7a1b3ad Web:Client: move FilterGroups and FilterKeys constants to common 2023-03-03 11:05:26 +03:00
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03:00
Timofey Boyko
769abeb9e9 Web:Common:Constants: add new role and type 'Collaborator' 2023-02-22 10:39:55 +03:00
Timofey Boyko
2bbcf5a03a Web: move wrongPortalNameUrl to common/constants 2023-02-08 10:58:35 +03:00
Vashchuk Nikita
ab7f24a68b Merge branch 'release/rc-v1.2.0' into feature/notifications 2023-02-02 18:48:48 +05:00
dd3ef94eaa Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-30 15:06:33 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
864e3c9c33 Web: Notifications: Added api methods. 2023-01-27 16:22:21 +03:00
c79a874d03 Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-25 11:49:50 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
d3f06ca8b2 Web: Client: GlobalEvents: Added change user type event 2022-12-26 21:15:22 +03:00
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
Mushka Nikita
55598886bb returned feed translations and added new way of getting them 2022-12-12 15:38:15 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
b0a8c93054 Merge branch 'develop' into feature/new-docspace-translations 2022-12-01 18:43:19 +03:00
Timofey Boyko
16a3e65c71 Web:Common:Constants: add new filter subject enum 2022-11-30 17:15:02 +03:00
Timofey Boyko
9933e577e6 Web:Common:Constants: fix payments enum 2022-11-30 15:47:11 +03:00
Timofey Boyko
a2213c9366 Web:Common:Constants: add new payments enum 2022-11-30 12:24:12 +03:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
Akmal Isomadinov
986b77057e Web:Common:Constants: Removed FilterTypeKeys constant 2022-11-18 13:10:52 +05:00
Akmal Isomadinov
fe6ec38dff Web:Common:Constants: Added FilterTypeKeys 2022-11-16 20:31:14 +05:00
4a313d77d6 Merge branch 'develop' into feature/api-origin 2022-11-15 16:00:39 +03:00
Akmal Isomadinov
8dda8926ee Web:Common:Constants Added FolderNames constant 2022-11-14 15:04:50 +05:00
8da3deaa72 Added api_origin 2022-11-13 22:38:33 +03:00
35545b4bff Web: Common: Constants: Added new user type 2022-10-27 09:35:44 +03:00
9f7f9bfd8a Replaced local onlyoffice-document-editor-react component 2022-10-20 18:47:02 +03:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
TimofeyBoyko
6eda3b0d89 Web:Common:Constants: add new employee types 2022-10-13 19:46:38 +05:00
745554af03 Web:Common:Add RoomsProviderTypeName. 2022-10-13 11:55:54 +03:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03: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
92f28a066c Web:Common:Add RoomsProviderType. 2022-10-05 14:52:02 +03:00
mushka
303f2c96ff added new FeedActionTypes and FeedItemTypes consts 2022-10-02 02:44:29 +03:00
mushka
c3a1be7be8 added constants for feed actions 2022-09-26 10:35:58 +03:00
3d2550860e Web: Client: Added new access constants 2022-09-22 18:10: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
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
TimofeyBoyko
72af5e7549 Web: mode global events constants from client to common 2022-09-15 13:24:18 +03:00