IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9cf550e1f0
DocSpace-client/common/ASC.Migration/Resources
History
Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
..
MigrationResource.az.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.bg.resx added translations 2023-05-15 17:52:57 +03:00
MigrationResource.cs.resx added translations 2023-05-15 17:52:57 +03:00
MigrationResource.de.resx added translations 2023-08-04 17:07:12 +03:00
MigrationResource.Designer.cs fix comments 2023-04-17 16:38:00 +03:00
MigrationResource.el-GR.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.es.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.fi.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.fr.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.hy-AM.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.it.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.ja-JP.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.ko-KR.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.lv.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.nl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.pl.resx added translations 2023-05-18 18:23:26 +03:00
MigrationResource.pt-BR.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
MigrationResource.pt.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.resx moved from ddf515b8 2022-06-05 18:44:37 +03:00
MigrationResource.ru.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.sk.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.sl.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.tr.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.uk-UA.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.vi.resx added translations 2023-05-12 18:18:10 +03:00
MigrationResource.zh-CN.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00