Commit Graph

38149 Commits

Author SHA1 Message Date
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
Viktor Fomin
3e8fecf7ba Merge branch 'develop' into feature/tg-reports 2023-09-21 13:19:13 +03:00
a6d3cf0fcd fix build 2023-09-21 12:53:00 +03:00
Viktor Fomin
72ff8db144 Merge branch 'develop' into feature/tg-reports 2023-09-21 12:35:07 +03: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
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
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
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
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
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
52460ab0b1 Web: Files: removed useless someDialogIsOpen 2023-09-20 13:29:59 +03:00
925451db9d Web: Files: fixed leave-room for user 2023-09-20 13:29:18 +03:00
913f409f03 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room 2023-09-20 13:10:26 +03:00
06846b07d2 Web: Files: Leave-room: fix 2023-09-20 13:10:15 +03:00
gazizova-vlada
cc31a46cb9 Web:Fix common. 2023-09-20 12:53:29 +03:00
91e359f834
Merge pull request #1743 from ONLYOFFICE/feature/urlShortener
update urlShortener
2023-09-20 02:39:22 -07:00
3a1bf92291 Merge branch 'develop' into feature/leave-room 2023-09-20 13:20:56 +04:00
e356f361f3
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
2023-09-20 13:10:36 +04:00
Akmal Isomadinov
539db1caf1 Web:Cron Added namespace for translation 2023-09-20 13:51:52 +05:00
Akmal Isomadinov
4dde3cfdad Web:Cron: Added localization of the week 2023-09-20 13:42:33 +05:00
6b90620977
Merge pull request #1740 from ONLYOFFICE/feature/optimization-ef
Feature/optimization ef
2023-09-20 01:39:49 -07:00
17fbf76e92 fix urlShortener 2023-09-20 11:35:35 +03:00
Akmal Isomadinov
c1983fcfa6 Web:Cron Added translation 2023-09-20 13:34:26 +05:00
Akmal Isomadinov
a223d684f7 Web:Cron Optimizing rendering 2023-09-20 13:30:37 +05:00
Viktor Fomin
73118da8f2 Merge branch 'develop' into feature/split-invite 2023-09-20 10:52:17 +03:00
39d982cd63
Merge pull request #1755 from ONLYOFFICE/bugfix/infinite-sso-loader
bugfix/infinite-sso-loader
2023-09-20 11:51:13 +04:00
Viktor Fomin
2085f23a60 Client: PortalSettings: SSO: fix infinite loader 2023-09-20 10:48:24 +03:00
caad6c0342 fix migration 2023-09-19 19:47:38 +03: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
f1e8c8390c fix 2023-09-19 18:56:58 +03:00
2e7fc53dcf Web: Fix crash on thirdpartiesLogo undefined 2023-09-19 19:22:07 +04:00
133f1b768c executedelete in DeleteFolderAsync 2023-09-19 18:20:45 +03:00