Commit Graph

1368 Commits

Author SHA1 Message Date
Akmal Isomadinov
e72bb1d9a9 Web:Common:store:UserStore Fixed mobx warning when changing the theme 2023-04-11 13:47:08 +05:00
df62b3862f Merge branch 'release/v1.0.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/components/scrollbar/custom-scrollbars-virtual-list.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
a9e02567a4 Web: PortalSettings: Payments: Added updating tariff dates. 2023-04-07 17:24:19 +03:00
fa7447048c Web: The function has been moved to the common 'utils'. 2023-04-07 17:23:34 +03:00
Akmal Isomadinov
2231aa5df3 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-07 18:13:54 +05:00
Akmal Isomadinov
58cdb9c5f8 Web:client:Components:PeopleSelector Fixed bug 61971 2023-04-07 18:13:42 +05:00
52b7a8cc1e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-07 15:16:26 +03:00
8d7875c183 Web: Added waiting for receiving quotas before displaying payment alert. 2023-04-07 15:16:05 +03:00
64c44bed2a Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-07 16:14:11 +04:00
9f12057bae Web: Common: renamed documentationEmail to bookTrainingEmail 2023-04-07 14:24:49 +03:00
c8424987a5 Merge branch 'release/v1.0.0' into feature/profile-menu 2023-04-07 14:20:51 +03:00
eb755a3207 Web: Common: moved supportEmail to SettingsStore 2023-04-07 14:05:01 +03:00
Viktor Fomin
fc1971ecea Fix Bug 61984: Clear all button when one filter element is set 2023-04-07 13:07:48 +03:00
caa0fb1298 Web: Fix Zendesk widget z-index (table header issue) 2023-04-07 12:30:05 +04:00
800e665f22 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-06 18:57:37 +04:00
df8599bd87 Web: Added offset, lable, color, z-index for Zendesk widget 2023-04-06 18:56:36 +04:00
Viktor Fomin
874c034ff6 Common: SettingsStore: fix mobx warning 2023-04-06 15:51:40 +03:00
616af05d10 Web: Added tariff update when status is returned from a socket. 2023-04-06 12:51:43 +03:00
5d0c9f8f18 Web: Article: Added missed prop. 2023-04-05 17:30:30 +03:00
Viktor Fomin
ea3a48ad32 Common: Components: LoginContainer: fix style 2023-04-05 14:41:13 +03:00
2d9f979cad Web: Article: Added missed imports. 2023-04-05 11:12:32 +03:00
e35e8f1369 Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-05 11:20:45 +04:00
1fd451fa2d Merge branch 'release/v1.0.0' into features/return-zendesk-and-book-a-training 2023-04-04 19:22:09 +04:00
fd3eac23b7 Web: Added bookTrainingEmail from settings api 2023-04-04 19:18:07 +04:00
6e53c7cee0 Web: Added zendeskKey from settings api 2023-04-04 19:07:30 +04:00
0aa56967dc Web: Fixed translations. 2023-04-04 16:38:02 +03:00
7a86276e81 Web: Article: Fixed alerts styles. 2023-04-04 16:36:07 +03:00
cbf43dbd53 Web: Article: Added check. 2023-04-04 13:16:47 +03:00
e752574c57 Web: Added Zendesk live chat + refactoring 2023-04-04 00:46:59 +04:00
a6ef872176 Web: Added condition for displaying alerts. 2023-04-03 16:09:25 +03:00
5744f7e67c Web: Added team training alert. 2023-04-03 15:42:51 +03:00
c616e61008 Merge branch 'release/v1.0.0' into feature/alert-component 2023-04-03 14:42:54 +03:00
c0eedf719c Web: Added AlertComponent. 2023-04-03 13:52:06 +03:00
a9355c4ea6 Web: Added new LiveChat and BookTraining menu to Profile 2023-04-03 14:43:01 +04:00
c88c6da4b5 Web: PortalSettings: Payments: Added check for nonProfit. 2023-04-03 12:03:21 +03:00
Akmal Isomadinov
90523580ca Web:Common:Components:MediaViewer:Sub-Components:ViewerLoader Fixed props type 2023-03-31 13:44:04 +05:00
2f8d21fc42 Web: Fixed errors. 2023-03-30 18:11:14 +03:00
Timofey Boyko
f3f150b6f0 Web: remove react-resize-detector 2023-03-30 16:54:20 +03:00
Timofey Boyko
42707ff490 Web:Common:Section: fix section resize event 2023-03-30 16:50:01 +03:00
Viktor Fomin
fe28a6a3df Common: add redirect for deactivated portal 2023-03-30 11:34:25 +03:00
Timofey Boyko
ad1aef8768 Web:Common:Section: delete code for @container 2023-03-29 15:57:16 +03:00
Viktor Fomin
62e5584924 Common: add isOAuthAvailable 2023-03-29 14:43:48 +03:00
Timofey Boyko
801db0393f revert 6bfbec9334 2023-03-29 14:32:54 +03:00
ecb339ebbc Web: Added updating quota characteristics using a socket. 2023-03-29 14:14:48 +03:00
Viktor Fomin
7356bd6170 Common: add isThirdPartyAvailable 2023-03-29 13:56:58 +03:00
Timofey Boyko
6bfbec9334 Update styled-components to beta version 2023-03-29 11:50:30 +03:00
1ef1998541 Web: PortalSettings: Payments: Changed translation. 2023-03-29 10:41:03 +03:00
Timofey Boyko
b8f258bd97 Web:Common:Section: add container type 2023-03-28 17:14:25 +03:00
Timofey Boyko
a268afab36 Web:Common:Section: add container name 2023-03-28 17:12:35 +03:00