Commit Graph

38699 Commits

Author SHA1 Message Date
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
fa97d645d2 fixed offset calculating 2023-09-22 17:40:06 +03:00
2c318669db Merge branch 'develop' into feature/creating-room-from-data 2023-09-22 18:39:56 +04:00
581b120234 fixed possibility to invite yourself 2023-09-22 17:39:25 +03:00
gazizova-vlada
0df4122c08 Web:Client:Change create to createRoom. 2023-09-22 17:31:45 +03:00
31bf677340 Merge branch 'develop' into feature/oauth2-client 2023-09-22 17:31:22 +03:00
8e751923d9 Web:OAuth2: add CRUD 2023-09-22 17:28:37 +03:00
gazizova-vlada
3405508312 Web:Client:Refactoring. 2023-09-22 17:24:28 +03:00
gazizova-vlada
8703e6fc63 Web:Client:Fix bufferSelection. 2023-09-22 17:03:09 +03:00
573afcb448 Web: Files: PublicRoom: fixed external link actions 2023-09-22 16:46:14 +03:00
Nasrullo Nurullaev
e4a2a4cd9f
Fix issue with starting Elasticsearch service (#1762)
* Fix issue with starting Elasticsearch service

* Small fixes
2023-09-22 18:29:40 +05:00
d42dc1c543
Merge pull request #1516 from ONLYOFFICE/feature/document-service-location
Feature/document service location
2023-09-22 17:22:39 +04:00
4048d8dc82 Web: removed useless translation key ResetButton 2023-09-22 17:21:24 +04:00
3c9dfca8c8 Web: Removed useless translations 2023-09-22 17:16:52 +04:00
a6d9ea95e9 Web: Removed useless key DNSSettingsTooltip 2023-09-22 17:13:57 +04:00
c91a2dfc36 Web: Added new SettingsDSConnect loader 2023-09-22 17:09:07 +04:00
gazizova-vlada
4677e8875b Merge branch 'develop' into feature/creating-room-from-data 2023-09-22 16:05:42 +03:00
gazizova-vlada
6a085a65c1 Web:Client:Add CatalogRoomsReactSvgUrl, translation. 2023-09-22 16:03:09 +03:00
gazizova-vlada
0c394ee1d2 Web:Client:Add Create room in getGroupContextOptions. 2023-09-22 15:55:27 +03:00
gazizova-vlada
9965519c89 Web:Client:Fixed function availability. 2023-09-22 15:48:09 +03:00
8371330d3c Web: Applied new design 2023-09-22 16:39:08 +04:00
ebdffb55ea Update yarn.lock 2023-09-22 15:38:32 +03:00
ac496b82a2 Add oauth service proxy 2023-09-22 15:38:11 +03:00
269e76bbec Web: moved const creation into condition block 2023-09-22 16:26:51 +04:00
a4a89ed1c4 web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing 2023-09-22 16:25:41 +04:00
5dab788680 Web: Files: InfoPanel: added infinite-loader to members list 2023-09-22 15:10:48 +03:00
e28d1b8704 fixed invitation resend 2023-09-22 14:52:10 +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
f5e0260558 Web: Client: fix closing dropdown after click on input
(bug 60655 does not appear)
2023-09-22 13:44:02 +02:00
179441e4cd Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-22 13:43:07 +02:00
0a12dbef57 Web: Applied isDefault 2023-09-22 14:53:52 +04:00
6d6116c5ce merge from develop 2023-09-22 13:39:24 +03:00
gazizova-vlada
a1d2c7565b Web:Client:Add t, processCreatingRoomFromData, fix selections. 2023-09-22 13:35:43 +03:00
9557a57616 Merge branch 'hotfix/v1.1.3' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.3 2023-09-22 13:16:04 +03:00
5a530364c7 nlog: remove /health logs 2023-09-22 13:15:44 +03:00
26c6c5e252 fixed link shortening 2023-09-22 12:52:07 +03:00
68eda4bbb5 removed links templates 2023-09-22 12:49:44 +03:00