Commit Graph

557 Commits

Author SHA1 Message Date
9f198ef31d fixed user avatar/room logo cache 2022-12-27 18:20:05 +03:00
553a2a7843 fixed nginx config 2022-12-26 20:29:34 +03:00
8167b9d26c storage logo fixed cach 2022-12-26 20:09:11 +03:00
b25dbdf123 improved user/room logo images load 2022-12-23 17:08:06 +03:00
f687c16a6b fixed StorageHandler class 2022-12-22 18:48:30 +03:00
e47d45c7fd Merge branch 'release/rc-v1.2.0' into feature/cache-fix 2022-12-22 16:17:06 +03:00
579a050625 config: Added .svg to "viewed-images" array. 2022-12-16 19:03:56 +03:00
4c29cede49 fixed cache bugs 2022-12-14 16:26:13 +03:00
fd20a8e803 added cache *.woff2 files 2022-12-13 19:42:47 +03:00
1f5351c4cf Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-12 19:34:08 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
5e2d50aa7c fixed upload url 2022-12-12 19:07:30 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
Vashchuk Nikita
38857366e1 Bug 59715 - Studio: Users. Аватарки пользователей не кешируются браузером 2022-12-12 14:09:29 +05:00
fb3af4d1c0 Build: Docker: fix run api-system 2022-12-09 16:37:19 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
8dac43b756 Files: removed products/files/httphandlers 2022-12-08 13:24:57 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
Timofey Boyko
0ca58b19fe Add nginx location for open docspace at desktop editors 2022-12-06 15:57:19 +03:00
a44d24d86f Merge branch 'develop' into feature/migration_personal 2022-11-30 16:24:04 +03:00
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +03:00
baedfcc93a fixed performance issue 2022-11-29 16:47:26 +03:00
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
Sergey Kirichenko
dfa948d5b3
Delete docker services (#1081) 2022-11-24 17:47:27 +03:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
d3d91ba54e Merge branch 'develop' into feature/custom-theme 2022-11-23 19:57:15 +03:00
ff5272dee3 Config: Added blank appsettings.dev.json for docker containers 2022-11-22 12:05:39 +03:00
Vlada Gazizova
f3d9aa918d
Web:Formatted appsettings.json. 2022-11-21 16:22:59 +03:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
29d52e6d06 Web:Change themelimit. 2022-11-21 11:04:19 +03:00
35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Core/LogoUploader.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
8ab20eea79 Merge branch 'develop' into feature/api-origin 2022-11-17 18:16:43 +03:00
cce692a601 Delete redis.test.json 2022-11-17 17:39:44 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
af88793aa4 Merge branch 'develop' into feature/api-origin 2022-11-17 16:09:15 +03:00
22c6aa6896 Api: cors support 2022-11-17 15:58:40 +03:00
sk81.biz@gmail.com
cb5c90f700 Fix nginx cors error 2022-11-16 19:02:48 +03:00
e50833f7f3 common settings for configure aws cloudwatch credentials 2022-11-16 12:44:53 +03:00
b379931d1f fix whitelabel 2022-11-15 14:11:44 +03:00
7856f6894f Web:Change thelimit to 11. 2022-11-14 15:43:22 +03:00
aa0222f078 Merge branch 'develop' into feature/migration_personal 2022-11-11 15:05:26 +03:00
991620468d change format logs for CloudWatch 2022-11-08 15:37:52 +03:00
14a64f4ad0 Merge branch 'develop' into feature/remove-waste
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
e765272e7a fixed appsettings.json 2022-11-01 15:24:17 +03:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
a414d68182 Merge branch 'develop' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
#	common/ASC.Data.Storage/StorageFactory.cs
2022-10-28 12:16:36 +03:00
206aabc628 activemq: added configs 2022-10-24 14:48:53 +03:00