|
|
9761a340f5
|
Move many translation keys to Common
|
2024-02-13 04:42:10 +04:00 |
|
|
|
ae23aaf0e2
|
Shared:Utils:MinifyJson: move from common
|
2024-01-11 11:28:42 +03:00 |
|
|
|
1dcdccb590
|
Added new caching rules for files in public/scripts
|
2023-11-13 03:25:32 +04:00 |
|
|
|
e6aac472bc
|
merge from develop
|
2023-10-03 17:30:04 +03:00 |
|
|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
|
7abaca70eb
|
Added minification of common locales in publish/web
|
2023-10-03 12:37:37 +04:00 |
|
|
|
d3b5085525
|
Remove files from other repositories
|
2023-10-02 14:04:28 +04:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
b5900aff6f
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-29 14:39:31 +04:00 |
|
|
|
17d75bc474
|
Merge pull request #1778 from ONLYOFFICE/feature/distributed-task-cancellation-token
Feature/distributed task cancellation token
|
2023-09-29 03:11:34 -07:00 |
|
|
|
7eb9f4700a
|
ApiSystem: fix
|
2023-09-29 12:53:08 +03:00 |
|
|
|
aa26f284fa
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 10:36:31 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
9811aaca33
|
ASC.Common: DistributedTaskProgress: added own property CancellationToken
|
2023-09-28 11:00:58 +03:00 |
|
|
|
114bca4692
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-28 11:26:19 +04:00 |
|
|
|
006c552ae6
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-26 14:40:33 +03:00 |
|
|
|
6af5cf8295
|
ASC.Web.Core: WebPluginManager: read system plugins from storage
|
2023-09-26 14:37:57 +03:00 |
|
Viktor Fomin
|
26bb33516a
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-26 13:06:45 +03:00 |
|
Viktor Fomin
|
26dfd295b1
|
TelegramReports: add listening firebase, delete useless
|
2023-09-26 12:17:33 +03:00 |
|
|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
b999ecb5dd
|
fixed warnings
|
2023-09-25 19:05:00 +03:00 |
|
|
|
2f08aae86a
|
Notify: fix footer
|
2023-09-25 17:11:13 +03:00 |
|
|
|
aa8d1cba60
|
Merge branch 'develop' into feature/notify-ref
|
2023-09-25 16:38:32 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
|
8385954e0f
|
Merge pull request #1766 from ONLYOFFICE/feature/message-ref
MessageService: refactoring
|
2023-09-25 04:38:03 -07:00 |
|
Viktor Fomin
|
c30c6742a2
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-25 11:00:51 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Viktor Fomin
|
7296a2e297
|
TelegramReports: fix
|
2023-09-24 22:46:09 +03:00 |
|
Viktor Fomin
|
e45c17b03b
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-24 11:49:14 +03:00 |
|
|
|
b670c532cc
|
MessageService: refactoring
|
2023-09-22 18:41:57 +03:00 |
|
|
|
c3c683f7a8
|
Geo: fix
|
2023-09-22 18:40:11 +03:00 |
|
|
|
fbf333a22d
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-22 14:48:59 +03:00 |
|
Viktor Fomin
|
ae842f59e7
|
TelegramReports: fix
|
2023-09-21 14:56:25 +03:00 |
|
|
|
9cf550e1f0
|
Notify: fix culture
|
2023-09-21 14:38:55 +03:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
|
4d1ead697e
|
removed nextPage parameter
|
2023-09-21 13:44:23 +03:00 |
|
|
|
5d6c1f051f
|
fix Bug 64204 - Settings: Backup.
|
2023-09-21 13:13:33 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
Viktor Fomin
|
72ff8db144
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-21 12:35:07 +03:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
|
|
42d30840ec
|
Api: CspStartupTask. Reset csp settings on webApi restart
|
2023-09-20 18:42:24 +03:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
|
91e359f834
|
Merge pull request #1743 from ONLYOFFICE/feature/urlShortener
update urlShortener
|
2023-09-20 02:39:22 -07:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
f6c1406cea
|
fix urlShortener
|
2023-09-19 19:42:01 +03:00 |
|
|
|
878bf35ce7
|
execute delete in SaveAsync
|
2023-09-19 17:00:54 +03:00 |
|
|
|
166b5ddeee
|
ASC.Web.Core: WebPluginManager: small fixes
|
2023-09-19 15:44:01 +03:00 |
|
