Commit Graph

435 Commits

Author SHA1 Message Date
abaf381a09 Files: increase limits 2021-08-31 17:03:51 +03:00
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
d19c16565d Files: presigned url 2021-08-11 18:04:23 +03:00
e66f1f31bf Files: added sync convert 2021-08-11 17:32:40 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
d8612e2e01 Hide Privacy Rooms on personal 2021-07-09 18:41:07 +03:00
Artem Tarasov
4f963784d3 Merge branch 'develop' into feature/thumbnails 2021-06-30 13:47:41 +03:00
dd64101332 remove itemList 2021-06-18 15:56:15 +03:00
Artem Tarasov
83549b62cd Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/api/files/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
a226cca872 Files: update document templates 2021-06-18 10:45:45 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
6b1656ff10 Files: settings 2021-06-11 14:33:07 +03:00
61e957d00a Files: added /subfolders request 2021-06-11 14:24:01 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
1a6d18fcdc Files: fixed start docs 2021-05-31 12:37:13 +03:00
c8c5b49d1c Files: thumbnails. 2e37dcd0 2021-05-30 21:52:32 +03:00
d8adef733c ASC.Files: moved from 08a01422 2021-05-26 16:54:46 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
e4f10d16cb Server: Files: Controller: FilesController: Fixed model parse for delete share 2021-05-19 16:50:08 +03:00
359ead6b85 Files: added RecentSection, FavoritesSection 2021-05-13 20:25:49 +03:00
7baf093162 fix Bug 50092 2021-05-06 13:27:15 +03:00
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
7f059353c7 Files: fix thridparty opitons 2021-05-05 14:48:15 +03:00
2d8b085d02 add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
7e2a991eec Files: fixed fileops/move 2021-04-15 21:43:12 +03:00
d76239e8b4 Files: MoveOrCopyBatchCheck now is post method 2021-04-15 11:48:23 +03:00
9b3d0b8d39 Files: fixed root query 2021-04-13 12:46:25 +03:00
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
a11804b60d temp fix. BinaryFormatter deprecated in .net 5 2021-04-02 21:48:40 +03:00
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
18a2c0a53d Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +03:00
Diana
4e62f6a204 update migrations ef tools v.5.0.3 2021-03-09 20:56:57 +03:00
f734a91d82 Files: fix SaveEditing 2021-03-01 14:38:55 +03:00
7852dac3ca Files: fix saveediting 2021-02-26 17:07:08 +03:00
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
Ilya Oleshko
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
a9b16585ea Files: fix delete 2021-01-29 10:17:56 +03:00
0246a30e84 Files: fix creation text file 2021-01-27 21:11:47 +03:00
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
64655a7da0 Api: modules. Added info method 2021-01-25 17:37:26 +03:00
1602fff50c Files: fix insert 2021-01-25 12:04:25 +03:00
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00