Commit Graph

3356 Commits

Author SHA1 Message Date
c875bdc926 Tariff: fix cache 2023-04-12 18:11:29 +03:00
990128748b DI: fix startup 2023-04-12 14:07:37 +03:00
13ca42dcc0 Translations: Test: Add new NotTranslatedPropsTest 2023-04-12 14:30:22 +04:00
cab1cacba5 ApiSystem: fix 2023-04-12 11:20:46 +03:00
ed96fe2bdb refresh quota 2023-04-11 18:58:44 +03:00
8ca2a24366 fixed NullReferenceException 2023-04-11 18:31:36 +03:00
42e8b739f3 fix Bug 61992 2023-04-11 17:52:39 +03:00
bfd7e78815 Translations: Tests: Added new WrongTranslationTagsTest 2023-04-11 14:59:08 +04:00
d7946d412d fix quota 2023-04-11 13:21:16 +03:00
d88fd2c2b2 fix merge 2023-04-10 23:20:16 +03:00
4dad1d6067 Merge branch 'develop' into feature/optimization-ef 2023-04-10 23:19:56 +03:00
df62b3862f Merge branch 'release/v1.0.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/components/scrollbar/custom-scrollbars-virtual-list.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
fed1eb60eb fix Filters 2023-04-10 14:04:11 +03:00
dd2155e36d fix MessagesRepository 2023-04-10 14:02:57 +03:00
9ea02d2c33
Merge pull request #1340 from ONLYOFFICE/fix/quota
Fix/quota
2023-04-10 12:21:35 +03:00
6ed8cebb5f fix 2023-04-10 11:41:12 +03:00
40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
0b929fe1d9 writer.WriteEntry outside ActionInvoker.Try 2023-04-07 17:57:56 +03:00
NikitaVashchuk
4bf565999b fix change-quota-feature-value room for maxInt value 2023-04-07 19:35:32 +05:00
389c20bf67 fix quota 2023-04-07 17:02:53 +03:00
8d9b4404cf fix Bug 61978 2023-04-07 16:53:30 +03:00
64c44bed2a Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-07 16:14:11 +04:00
dc25ce1162 fix async 2023-04-07 11:42:03 +03:00
dec0d918d4 fix CachedQuotaService.cs 2023-04-07 11:06:18 +03:00
11f32720a6 GetTenantAsync 2023-04-07 10:39:28 +03:00
ced642832e fix merge 2023-04-06 18:18:00 +03:00
e62ba6633f Quota: fix 2023-04-06 18:15:54 +03:00
b1e7c1d0e6 fix merge 2023-04-06 17:24:14 +03:00
07d847fdd1 Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
1ac20fd57e fix checking quota 2023-04-06 11:47:56 +03:00
138544c86c remove CreateExecutionStrategy 2023-04-05 19:30:35 +03:00
37b28738ae Quota: fix 2023-04-05 19:05:46 +03:00
NikitaVashchuk
69230b5dc6 added change-quota-feature-value for CountRoomFeature and FreeFeature 2023-04-05 19:30:59 +05:00
e35e8f1369 Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-05 11:20:45 +04:00
edefc8e959 fix 2023-04-04 20:01:33 +03:00
NikitaVashchuk
1827dead7e fix problems with notify about count paid users 2023-04-04 17:23:46 +05:00
a733c29c2b Merge branch 'develop' into refactoring/generic-classes 2023-04-04 12:33:26 +03:00
Vashchuk Nikita
0db7c335bf socket notification when archiving a room,
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
f1e0730e0f fix GetScheduledBackupRecords 2023-03-30 23:17:56 +03:00
5aacc82904 fixed room history 2023-03-30 18:36:22 +03:00
c44297cba7 fix 2023-03-30 18:02:12 +03:00
Vashchuk Nikita
604b67fa58 functionality for notification ASC.Socket.IO about quota changes 2023-03-30 19:13:13 +05:00
bb2a90fc00 fix 2023-03-30 15:37:01 +03:00
0ffeed1c7f fix migration 2023-03-30 15:29:17 +03:00
6309d9530c fix async 2023-03-30 15:11:45 +03:00
87234ea2bf
Merge pull request #1314 from ONLYOFFICE/features/formats
Features/formats
2023-03-30 13:09:48 +05:00
76b68d74f8 fix: hidden _usersInRoomFeature and fix portal/payment/quota 2023-03-29 17:48:52 +03:00
9e7bbf6492 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-29 13:47:12 +03:00
0af471a215 fixed history 2023-03-29 13:46:54 +03:00
08d4050143 fix backup s3: split stream 2023-03-29 12:19:35 +03:00
fdba9bec6c Socket: Added changeQuotaUsedValue and changeQuotaFeatureValue 2023-03-28 22:27:15 +04:00
27c7804aba fix methods with task and without async 2023-03-28 13:49:31 +03:00
e1b01e2d81 fix methods with task and without async 2023-03-28 13:13:13 +03:00
0bcd45f0ce fix async 2023-03-28 10:43:46 +03:00
aac1896a0f remove CreateDbContextAsync and fix ExecuteAsync 2023-03-28 00:25:55 +03:00
d39c28046c add CustomSynchronizationContext 2023-03-27 15:04:50 +03:00
44317ee151 WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
Timofey Boyko
bec19bb207 Add to test ignore images/nofifications folder 2023-03-24 15:53:55 +03:00
ba4059e8b0 fix quota 2023-03-24 15:07:08 +03:00
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
Bugfix/notification image format
2023-03-24 12:39:32 +03:00
Vashchuk Nikita
bce9c8029d attachment as inline 2023-03-24 13:10:00 +05:00
63ee0ca117 UserDbContext - async 2023-03-24 10:53:49 +03:00
0abe404476 invitation link: added tariff/quota/permissions check, refactoring 2023-03-23 16:22:01 +03:00
d1213f7b04 fix Bug 61712 2023-03-22 23:52:59 +03:00
Vashchuk Nikita
2b94d5dfa5 changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
2023-03-23 00:25:15 +05:00
fc78a0508d TenantDbContext -async part2 2023-03-22 11:27:01 +03:00
18cc3d09c6 fix async 2023-03-21 17:28:06 +03:00
5e11ff91eb fix 2023-03-21 14:47:14 +03:00
422e0bf3f2 formats for editor(pr 1305) 2023-03-21 12:42:09 +03:00
ebd4f7d17c Merge branch 'develop' into refactoring/generic-classes
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.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/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Service/Startup.cs
2023-03-20 21:10:08 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
b96030c0b2 Quota: fix 2023-03-20 15:39:35 +03:00
9175233546 payment emails added 2023-03-19 12:25:31 +03:00
a2c35b0a40 backend: ldap/s3: removed check mono 2023-03-17 18:02:19 +03:00
f35425cb87 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-17 14:37:41 +03:00
bafbe2c81b fixed notification 2023-03-17 14:37:06 +03:00
b735e3415a MessaginSystem: added root folder title in notification info 2023-03-17 14:34:22 +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
2032329753 fix quota 2023-03-17 13:55:21 +03:00
dde9cac96e TelegramDbContext - async 2023-03-17 11:47:17 +03:00
7d6feae7cd NotifyDbContext- async 2023-03-17 11:32:55 +03:00
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +03:00
046deda226 fix 2023-03-16 13:47:56 +03:00
8ebdf69654 ResourceManager: fix 2023-03-16 12:27:13 +03:00
5de3a26365 Quota: contentsearch 2023-03-16 12:24:56 +03:00
f67aec6a78 update MySQL from 8.0.31 => 8.0.32.1 2023-03-15 22:15:02 +03:00
7c62a00ba3 IntegrationEventLogContext - async 2023-03-15 20:33:17 +03:00
71073f4e88 InstanceRegistrationContext - async 2023-03-15 18:59:19 +03:00
e5749eb986 FirebaseDbContext - async 2023-03-15 16:39:41 +03:00
393887f67b FilesDbContext- async 2023-03-15 16:24:02 +03:00
e4acd2776c FeedDbContext - async 2023-03-15 13:04:34 +03:00
e98784fd42 CustomDbContext - async 2023-03-15 12:22:30 +03:00
3553cfe733 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-15 12:13:12 +03:00
df2d288119 AuditTrail: added rooms module in resource 2023-03-15 12:12:59 +03:00
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
backup chunk-size
2023-03-15 11:58:32 +03:00
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
1d87baec93 AccountLinkContext - async 2023-03-13 23:07:37 +03:00
9a1404a401 BackupsContext - async 2023-03-13 19:29:42 +03:00
cad10c140b Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 19:16:26 +03:00