Timofey Boyko
|
8dbdcf9cf5
|
Merge branch 'develop' into branch bugfix/fix-section-blinking
|
2023-05-02 11:10:02 +03:00 |
|
|
|
25fed493da
|
Merge branch 'develop' into feature/action-buttons-hints
|
2023-04-28 17:10:46 +04:00 |
|
Timofey Boyko
|
fbbc7721be
|
Web:Client: move Settings as nested route to home
|
2023-04-27 16:21:34 +03:00 |
|
Mushka Nikita
|
e2a1a3be00
|
added and returned optional chaining to some bool expressions in tags
|
2023-04-27 15:55:31 +03:00 |
|
Mushka Nikita
|
c590e5774f
|
fixed thirdpart tag update logic
|
2023-04-27 15:06:55 +03:00 |
|
Mushka Nikita
|
b417ae0365
|
Merge branch 'develop' into feature/thirdparty
|
2023-04-26 15:02:13 +03:00 |
|
|
|
db976e019e
|
Web: Fix routing to login (logout issues)
|
2023-04-24 14:25:14 +04:00 |
|
|
|
190fb7e5e7
|
Merge branch 'develop' into feature/action-buttons-hints
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/ru/Files.json
# packages/client/src/pages/Home/InfoPanel/Header/index.js
|
2023-04-20 15:39:46 +03:00 |
|
|
|
bccb3c86e3
|
Web: Files: added titles to info-panel icon, table-settings icon
|
2023-04-20 15:35:56 +03:00 |
|
|
|
3348134c28
|
Web: Files: added title to VersionHistory
|
2023-04-20 13:41:23 +03:00 |
|
|
|
464aed0f62
|
Merge branch 'develop' into feature/info-panel-toggle
|
2023-04-20 13:59:27 +04:00 |
|
|
|
f6bcfc05d4
|
Web: Files: added titles to MainButton, empty trash icon, lock icon, header menu
|
2023-04-20 12:43:51 +03:00 |
|
Mushka Nikita
|
d9fa1c91d8
|
fix crash
|
2023-04-20 11:47:46 +03:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
|
|
bcb1e5a076
|
Web: Fixed crash if third-party storage is connected.
|
2023-04-17 17:08:07 +03:00 |
|
Elyor Djalilov
|
a4db9a9f52
|
Fix Bug 62130 - Rooms. If set a filter with a long tag, a horizontal scroll bar appears
|
2023-04-17 17:41:24 +05:00 |
|
Timofey Boyko
|
77756918ac
|
Web: fix routing after wizard
|
2023-04-14 16:42:36 +03:00 |
|
Akmal Isomadinov
|
a425107710
|
Web:Client:Pages:AccountsHome:Section:Header Changed the logic of showing toggle button
|
2023-04-13 21:44:14 +05:00 |
|
Akmal Isomadinov
|
204e8819f7
|
Web:Common:Components:ColorTheme:styled:infoPanelToggle Changed the logic of showing the accent color
|
2023-04-13 18:50:15 +05: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 |
|
