Commit Graph

30 Commits

Author SHA1 Message Date
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
Akmal Isomadinov
8dda8926ee Web:Common:Constants Added FolderNames constant 2022-11-14 15:04:50 +05: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
TimofeyBoyko
c5b50e5d4a Web:Common:Constants: add new filter types and file types for oform and docx 2022-09-15 11:38:59 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +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
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
Artem Tarasov
bc0e986707 Web: Login/Common: added language cookie setting on the server 2022-08-30 17:50:54 +03:00
mushka
8ddbc66c6f created new RoomsTypeTranslations constant 2022-08-24 19:38:03 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
Artem Tarasov
a520446d69 Web: Packages: localStorage usage changed to cookies when saving language 2022-08-05 17:21:14 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00