Alexey Safronov 9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2 ... # Conflicts: # packages/asc-web-common/api/portal/index.js # packages/asc-web-common/components/Loaders/index.js # packages/asc-web-common/store/SettingsStore.js # packages/asc-web-components/file-input/index.js # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/save-cancel-buttons/index.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/src/store/ContextOptionsStore.js # public/locales/de/Common.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/NavMenu/index.js # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js # web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js # web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js # web/ASC.Web.Client/webpack.config.js # web/ASC.Web.Editor/src/Editor.jsx		2022-03-24 14:39:52 +03:00
..
api	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
components	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
constants	Web: Separated BackupTypes constant.	2022-03-21 12:06:10 +03:00
desktop	Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0	2021-12-13 17:58:34 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
hoc	Added and applied Common.json for common translations (languages issue)	2021-04-29 10:14:47 +03:00
store	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
sw	Web: SW: Fix unregister on undefined	2022-02-09 12:33:09 +03:00
utils	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
browserslist-config-asc.js	Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js	2021-09-27 16:04:37 +03:00
custom.scss	Web: Common: fixed drop down in aside mode advanced selector, fixed hide filter styles	2021-10-14 15:59:49 +05:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
opensansoffline.scss	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
package.json	Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage	2022-01-12 20:13:30 +03:00