Commit Graph

38677 Commits

Author SHA1 Message Date
35e40f617f Web: Added get DocumentService location settings 2023-09-21 17:28:15 +04:00
76252e407f Web: Hide DocumentServices for SAAS 2023-09-21 17:22:40 +04:00
420a620727 Add a check for localhost in product-configuration 2023-09-21 16:52:16 +04:00
Viktor Fomin
4a9ed75b2b Config: add telegramConf 2023-09-21 14:56:57 +03:00
Viktor Fomin
ae842f59e7 TelegramReports: fix 2023-09-21 14:56:25 +03:00
203fdc0695 public: api js polyfill 2023-09-21 14:41:11 +03:00
9cf550e1f0 Notify: fix culture 2023-09-21 14:38:55 +03:00
24a5bd2402 Web: Client: show inviteInputPanel after 2nd typed symbol 2023-09-21 13:35:04 +02: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
f7d4b5e556 pagination parameter nextPage replaced by total 2023-09-21 13:44:06 +03:00
Viktor Fomin
3e8fecf7ba Merge branch 'develop' into feature/tg-reports 2023-09-21 13:19:13 +03:00
5d6c1f051f fix Bug 64204 - Settings: Backup. 2023-09-21 13:13:33 +03:00
Nasrullo Nurullaev
f30eb860a0
fix Bug 62882 - Edit service names (#1759) 2023-09-21 13:05:14 +03:00
f07b1710a7 Merge branch 'develop' into feature/document-service-location 2023-09-21 13:56:22 +04:00
a6d3cf0fcd fix build 2023-09-21 12:53:00 +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
Viktor Fomin
343dfaa20d Client: PortalSettings: integration: fix align 2023-09-21 12:03:24 +03:00
c223e7bd30 pagination parameter nextPage replaced by total 2023-09-21 11:39:49 +03:00
2176cb65bb Merge branch 'develop' into bugfix/invitePanel-searchList 2023-09-20 18:12:26 +02:00
3f55c26687
Merge pull request #1758 from ONLYOFFICE/bugfix/fix-static-images
Web:Client: fix import images from image-helpers
2023-09-20 20:10:13 +04:00
abad1401f3 Web: Client: block showing addEmailPanel before searching 2023-09-20 18:00:12 +02:00
f834539c1e Files: removed doc's plugins 2023-09-20 18:56:04 +03:00
d1c3bb66bb Merge branch 'develop' into bugfix/fix-static-images 2023-09-20 19:53:29 +04: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
5f57f796e1 Login: Invalid: fix tKey 2023-09-20 17:36:37 +03:00
Viktor Fomin
ad177109a6 Client: PublicRoom: RoomErrors: fix tKey 2023-09-20 17:36:17 +03:00
Viktor Fomin
b3023358f2 Client: delete useless 2023-09-20 17:35:56 +03:00
Viktor Fomin
c0d87940f0 Web: move ExpiredLink translate to Common 2023-09-20 17:35:38 +03:00
f0607f08dd
Merge pull request #1618 from ONLYOFFICE/feature/reassign-data
Feature/reassign data
2023-09-20 18:32:26 +04:00
1abbdd85f3 Web: Client: fix usersList blinking when type 3rd symbol 2023-09-20 16:27:55 +02:00
gazizova-vlada
69961e6900 Merge branch 'develop' into feature/reassign-data 2023-09-20 17:19:12 +03:00
f1da568484 Merge branch 'develop' into feature/split-invite 2023-09-20 18:16:31 +04:00
1d3367da10
Merge pull request #1556 from ONLYOFFICE/feature/leave-room
Feature/leave room
2023-09-20 18:11:34 +04:00
gazizova-vlada
a061d42f29 Web:Add dataReassignmentUrl. 2023-09-20 17:03:31 +03:00
Viktor Fomin
6cc1b68702 Client: Confirm: CreateUser: add redirect to room 2023-09-20 17:03:31 +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
gazizova-vlada
dd3e9d3363 Web:Client:Fix update accounts list after delete, delete dataReassignmentUrl. 2023-09-20 16:20:28 +03:00
Nasrullo Nurullaev
64185f4bdb
fix Bug 64194 - Add OpenUrl action after canceling (#1749) 2023-09-20 15:53:58 +03:00
bdabb35e55 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-20 15:03:02 +03:00
940338fd9d Web: Files: Leave-room: bugs fixed 2023-09-20 15:02:34 +03:00
b25b39da14 Merge branch 'develop' into feature/web-plugins 2023-09-20 14:55:39 +03:00
Viktor Fomin
c5b982d239 Client: PortalSettings: Integration: fix style 2023-09-20 14:48:38 +03:00
3d20697ac0 Web: Translation: Fix UTC key duplication + sorting 2023-09-20 15:36:34 +04:00
cc966ed58a Web: Restored usefull code 2023-09-20 14:57:41 +04:00
4e588759d9 Web: Fix warning: Unsatisfied version 5.21.4 from @docspace/client of shared singleton module react-tooltip (required =5.21.1) 2023-09-20 14:50:03 +04:00
292f92e818 Web:Client: fix import images from image-helpers 2023-09-20 13:42:43 +03:00