Commit Graph

38720 Commits

Author SHA1 Message Date
8082cbeb96 Files: content param 2023-09-26 12:56:27 +03:00
8fcbd8fa9b Web: Files: fixed styles for expected users 2023-09-26 12:35:26 +03:00
bf6b30fb97 Web: Files: fixed warning 2023-09-26 12:30:02 +03:00
0ea8f36e4c Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization 2023-09-26 12:21:02 +03:00
2444f7c871 Web: Files: fixed double API request 2023-09-26 12:20:49 +03:00
Viktor Fomin
26dfd295b1 TelegramReports: add listening firebase, delete useless 2023-09-26 12:17:33 +03:00
ea3c18dcc7 Merge branch 'develop' into feature/room-share-optimization 2023-09-26 12:21:59 +04:00
88b283a28a Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys 2023-09-26 12:21:40 +04: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
69c2e88820
Merge pull request #1760 from ONLYOFFICE/feature/notify-ref
Feature/notify ref
2023-09-25 08:19:58 -07:00
2f08aae86a Notify: fix footer 2023-09-25 17:11:13 +03:00
fe51f00a4f Web: Files: fixed resendEmailInvitations 2023-09-25 17:07:25 +03:00
f4bc2d7575 Web: Files: fixed external link creation 2023-09-25 16:45:36 +03:00
aa8d1cba60 Merge branch 'develop' into feature/notify-ref 2023-09-25 16:38:32 +03:00
95b095a386 Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization 2023-09-25 16:37:45 +03:00
67bd4632ad Web: Files: InviteInput: fixed search 2023-09-25 16:37:37 +03:00
c9cacb9bbe Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop 2023-09-25 17:33:31 +04:00
6af064e456 Files: FileOpenedForChange 2023-09-25 16:21:35 +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
e59a189a84 Web: Files: MembersList: fixed mobile view 2023-09-25 15:38:22 +03:00
c0b36735dd Web: Applied server changes in api 2023-09-25 16:28:31 +04:00
d762d746fa Update yarn.lock 2023-09-25 16:27:28 +04:00
81612b04ef Web: Files: InfoPanel: fixed MembersList height 2023-09-25 15:00:05 +03:00
0db3fcc492 Web: Files: fixed MembersList height 2023-09-25 14:42:38 +03:00
8385954e0f
Merge pull request #1766 from ONLYOFFICE/feature/message-ref
MessageService: refactoring
2023-09-25 04:38:03 -07:00
7c62a28318 FilesMessageService: removed GetHttpHeaders 2023-09-25 14:14:57 +03:00
ee809f380d Web: Files: fixed AddUsersPanel 2023-09-25 13:55:37 +03:00
8b3ddf69f3 fix merge 2023-09-25 11:45:29 +03:00
991babc0ee Files: fixed ProlongEditing 2023-09-25 11:41:01 +03:00
be0dfa8441 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-09-25 11:07:12 +03:00
db1a8e530b backend: GetDocServiceUrlAsync respose with fixed format 2023-09-25 11:06:50 +03:00
Viktor Fomin
c30c6742a2 Merge branch 'develop' into feature/tg-reports 2023-09-25 11:00:51 +03:00
gazizova-vlada
62516a36bd Web:Client:Added that if a room is created from one folder, then only the contents of the folder are copied to the room, and not the folder itself. 2023-09-25 10:58:18 +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
44c46eb719 Fix getting environment value on ubuntu 18.04 2023-09-25 11:47:12 +04: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
4719e679d9 Nginx: add sendtgreport location 2023-09-24 21:29:36 +03:00
Viktor Fomin
a632883301 Build: fix telegramreports 2023-09-24 21:29:21 +03:00
Viktor Fomin
e45c17b03b Merge branch 'develop' into feature/tg-reports 2023-09-24 11:49:14 +03:00
dc27c8d8fc nlog: fixed 2023-09-23 09:50:53 +03:00
c81ffe04f2 Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-22 18:07:39 +02:00
b670c532cc MessageService: refactoring 2023-09-22 18:41:57 +03:00
c3c683f7a8 Geo: fix 2023-09-22 18:40:11 +03:00
70be87e984 Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-22 17:27:38 +02:00
bb1ab06e1a
Merge pull request #1763 from ONLYOFFICE/feature/creating-room-from-data
feature/creating-room-from-data
2023-09-22 19:09:26 +04:00
ec495bb299 Web: Files: MembersList: fixed styles 2023-09-22 17:57:04 +03:00
8bcfbd6310 Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization 2023-09-22 17:55:09 +03:00
9d4cfd2b76 Web: Files: fixed members list 2023-09-22 17:54:56 +03:00