Alexey Safronov 0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign ... # Conflicts: # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/themes/dark.js # public/locales/de/Common.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js # web/ASC.Web.Login/src/Login.jsx		2022-03-16 11:03:07 +03:00
..
api	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
components	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
constants	Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.	2022-02-10 19:49:44 +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
hoc	Added and applied Common.json for common translations (languages issue)	2021-04-29 10:14:47 +03:00
store	Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign	2022-03-16 11:03:07 +03:00
sw	Web: SW: Fix unregister on undefined	2022-02-09 12:33:09 +03:00
utils	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign	2022-02-22 13:53:00 +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