IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89059cf32e
DocSpace-buildtools/web/ASC.Web.Core/PublicResources
History
Alexey Safronov f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2 
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
..
CustomModeResource.de.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
CustomModeResource.Designer.cs fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
CustomModeResource.es.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
CustomModeResource.fr.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
CustomModeResource.it.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
CustomModeResource.resx fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
CustomModeResource.ru.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.de.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.es.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.fr.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.it.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.ru.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
PeopleNames.xml Added ASC.Feed, ASC.IPSecurity 2019-06-14 19:14:24 +03:00
Resource.de.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.Designer.cs Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.es.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.fr.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.it.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
Resource.ru.resx Portal: portalrename method 2022-02-17 16:39:47 +03:00
UserControlsCommonResource.de.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.es.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.fr.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.it.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.ru.resx WebStudio: resources 2021-05-27 21:30:15 +03:00
WebPatternResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
WebPatternResource.resx Added ASC.Feed, ASC.IPSecurity 2019-06-14 19:14:24 +03:00
webstudio_patterns.xml fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
WebstudioNotifyPatternResource.de.resx Notify: fix 2021-06-10 11:47:58 +03:00
WebstudioNotifyPatternResource.Designer.cs fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
WebstudioNotifyPatternResource.es.resx Notify: fix 2021-06-10 11:47:58 +03:00
WebstudioNotifyPatternResource.fr.resx Notify: fix 2021-06-10 11:47:58 +03:00
WebstudioNotifyPatternResource.it.resx Notify: fix 2021-06-10 11:47:58 +03:00
WebstudioNotifyPatternResource.resx fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
WebstudioNotifyPatternResource.ru.resx Notify: fix 2021-06-10 11:47:58 +03:00