819c6597f4
added translations
2023-05-18 18:23:26 +03:00
e0f82c1a86
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
2023-05-16 11:25:26 +03:00
47a8b890da
added translations
2023-05-15 17:52:57 +03:00
c65685b9ef
fix
2023-05-12 22:53:18 +03:00
6efa64b91b
remove unused resources
2023-05-12 22:48:47 +03:00
5a92a23467
remove crm resource
2023-05-12 17:36:47 +03:00
4f10368a78
added translations
2023-05-11 19:12:10 +03:00
a0293fee03
added translations
2023-05-10 18:42:42 +03:00
13a156bea9
added translations
2023-05-05 18:57:21 +03:00
738ae4e38d
added translations
2023-05-04 19:20:39 +03:00
7bed1e829c
edited Chinese
2023-05-02 15:14:05 +03:00
8687b3ae99
edited translations
2023-04-27 17:42:34 +03:00
a0adeba2e4
fix audit report
2023-04-22 15:54:34 +03:00
9656931ee7
AuditTrail: added context
2023-03-17 14:33:43 +03:00
f866617acd
AuditTrail: added message text for trash emptied action
2023-03-17 14:32:06 +03:00
df2d288119
AuditTrail: added rooms module in resource
2023-03-15 12:12:59 +03:00
3aaaf4eafe
AuditTrail: added new actions
2023-03-13 18:55:44 +03:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
610b2f7660
AuditTrail: added new audit message patterns
2023-02-02 13:28:31 +03:00
5aebd35844
AuditTrail: added room link update action
2023-02-02 13:25:18 +03:00
e116b85281
AuditTrail: added room unarchived action message
2023-02-02 11:51:22 +03:00
a48b77170f
AuditTrail: added rooms action mapper
2023-02-02 11:33:20 +03:00
6d625aece4
AuditTrail: added entry types for room and custom tag
2023-02-02 11:32:51 +03:00
d2b5ea72a5
AuditTrail: added module type for room
2023-02-02 11:30:27 +03:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
...
Feature/dotnet7
2023-01-19 22:00:57 +03:00
9937ecccee
fix
2023-01-19 18:32:37 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
bff2128b5f
Resources renamed
2023-01-18 18:53:09 +03:00
724345a2b7
fixed validate link restore password
2022-12-21 20:12:43 +03:00
143a4d01ec
removed unused variables
2022-12-09 17:47:46 +03:00
9dfcd25033
backend: update dependency dll
2022-11-14 14:11:10 +03:00
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +03:00
24829b5d9e
Audit: fix
2022-11-08 13:38:33 +03:00
2ae75ec762
fix ide001
2022-11-07 12:49:29 +03:00
118ba04fae
remove waste asc.auditTrail
2022-08-31 18:07:19 +03:00
a4ea50c760
split AuditReportCreator
2022-08-01 17:23:50 +03:00
58d3407729
fix
2022-08-01 13:58:14 +03:00
3c3234b6c2
Merge branch 'develop' into feature/fix-api
2022-08-01 13:51:05 +03:00
4559942c30
fix confrim links
2022-08-01 13:50:31 +03:00
615448319a
fix mapper
2022-07-29 18:39:57 +03:00
dba122eb96
Common, files: added dbcontext pool
2022-07-28 21:00:49 +03:00
8acb550b08
files helpers moved to ASC.Files.Core
2022-07-25 14:03:31 +03:00
b98524532f
Merge branch 'develop' into feature/migrations-fix
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-19 16:04:29 +03:00
40a5fb35df
fixed audit/login/last
2022-07-19 14:59:36 +03:00
Vashchuk Nikita
e49d082fa3
Merge branch 'develop' into feature/migrations-fix
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
2022-07-11 13:28:49 +03:00
aeac8613a8
Merge branch 'develop' into features/enum_generator
2022-07-05 17:22:43 +03:00
1218d31a42
enum generator
2022-07-05 16:58:11 +03:00
Vashchuk Nikita
5a0acc8eaa
Renaming folders for contexts and models
2022-07-01 14:23:07 +03:00
74d238bde8
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
2022-06-30 16:13:31 +03:00
