Tatiana Lopaeva 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
..
api	Merge branch 'develop' into feature/notifications	2023-02-22 15:50:55 +03:00
components	Merge branch 'develop' into feature/notifications	2023-02-22 15:50:55 +03:00
constants	Merge branch 'develop' into feature/notifications	2023-02-22 15:50:55 +03:00
desktop	Web: Common: desktop: added check for ssr	2022-08-17 11:56:50 +03:00
history
hoc	Web: add import svg with url	2023-01-11 18:08:01 +03:00
store	Common: add query for get settings with password	2023-02-15 11:52:19 +03:00
sw	Web:Editor: disable sw and fix tranlsation hash	2023-01-31 17:10:19 +03:00
utils	Web:Common:Utils: getBgPattern can accept undefined as colorSchemeId	2023-02-07 18:31:06 +03:00
browserslist-config-asc.js
custom.scss	Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS.	2023-01-26 20:23:50 +03:00
fonts.js
index.d.ts	Common: move more login modal	2022-11-16 17:23:15 +05:00
index.js
opensansoffline.scss	Web:Common: update import for fonts	2023-02-02 15:10:54 +03:00
package.json	Merge branch 'release/rc-v1.2.0' into feature/selection-area	2023-01-27 13:45:27 +03:00