Timofey Boyko
|
77756918ac
|
Web: fix routing after wizard
|
2023-04-14 16:42:36 +03:00 |
|
Timofey Boyko
|
0f5b165f70
|
Web: fix after merge
|
2023-04-13 11:33:08 +03:00 |
|
Timofey Boyko
|
1c96b65c02
|
Fix after merge develop
|
2023-04-12 13:59:53 +03:00 |
|
Timofey Boyko
|
e6f1969879
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-12 13:56:41 +03:00 |
|
Timofey Boyko
|
a858b346bd
|
Web: fix portal-settings routes
|
2023-04-11 14:50:44 +03: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 |
|
Timofey Boyko
|
62d8e54d59
|
Web: delete useless console log
|
2023-04-10 15:38:38 +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 |
|
|
|
8d7875c183
|
Web: Added waiting for receiving quotas before displaying payment alert.
|
2023-04-07 15:16:05 +03:00 |
|
Timofey Boyko
|
bc27f6684e
|
Web: change Routes component, fix render Home and Accounts
|
2023-04-07 14:00:36 +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 |
|
Timofey Boyko
|
8d6f0880ad
|
Web: change history to navigate/location
|
2023-04-07 12:51:10 +03:00 |
|
|
|
caa0fb1298
|
Web: Fix Zendesk widget z-index (table header issue)
|
2023-04-07 12:30:05 +04:00 |
|
|
|
df8599bd87
|
Web: Added offset, lable, color, z-index for Zendesk widget
|
2023-04-06 18:56:36 +04:00 |
|
Timofey Boyko
|
e8f6026dfb
|
Web: change Redirect to Navigate
|
2023-04-06 17:14:47 +03:00 |
|
Timofey Boyko
|
901d4e5992
|
Web: refacroting PrivateRoute and PublicRoute
|
2023-04-06 15:28:02 +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 |
|
|
|
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 |
|
Timofey Boyko
|
d5ea8ccdec
|
Web: remove useless withRouter and change import from 'react-router' to 'react-router-dom'
|
2023-04-04 17:37:21 +03: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 |
|
|
|
c0eedf719c
|
Web: Added AlertComponent.
|
2023-04-03 13:52:06 +03: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 |
|
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 |
|
|
|
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 |
|
Timofey Boyko
|
76ecb43491
|
Web:Common:Section: remove resize-detector
|
2023-03-28 13:52:15 +03:00 |
|
Timofey Boyko
|
809047e7e8
|
Web:Common:Section: rewrite for func componet
|
2023-03-28 12:37:57 +03:00 |
|
|
|
3a13ff5843
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-28 10:16:42 +03:00 |
|
|
|
966be1b9d0
|
Web:Common:Fixed the missing button to open the info panel on tablets with desktop resolution.
|
2023-03-28 10:14:30 +03:00 |
|
|
|
6d2c54e52a
|
Merge branch 'develop' into feature/react-18
|
2023-03-27 22:42:14 +04:00 |
|
|
|
fcc447b9b0
|
Merge branch 'release/v1.0.0' into develop
|
2023-03-27 22:40:23 +04:00 |
|
Elyor Djalilov
|
5276fa20aa
|
Web: Client: There is no height limit for dd
|
2023-03-27 15:01:25 +05:00 |
|
Elyor Djalilov
|
9bcd6fa02a
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-27 13:51:21 +05:00 |
|
Elyor Djalilov
|
346bc8f5e0
|
Web: Client: There is no height limit for dd
|
2023-03-27 13:51:13 +05:00 |
|
Akmal Isomadinov
|
a637a2d9c1
|
Web:Common:Components:MediaViewer:Sub-Components:ViewerPlayer Refactoring viewerPlayer
|
2023-03-24 23:09:49 +05:00 |
|
Akmal Isomadinov
|
08f9b8091f
|
Web:Common:Components:MediaViewer:Sub-Components:ViewerPlayer Fixed error message
|
2023-03-24 22:27:46 +05:00 |
|
