Commit Graph

31852 Commits

Author SHA1 Message Date
43e465697d Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed 2023-03-06 14:20:59 +04:00
694a8b3925 nginx location to filehandler.ashx 2023-03-06 13:14:04 +03:00
d35284a1b7 Merge branch 'develop' into bugfix/61465 2023-03-06 13:11:04 +03:00
Elyor Djalilov
b28f8e793b Web: PortalSettings: fix backup fields 2023-03-06 14:43:16 +05:00
Elyor Djalilov
d4fd62e2ec fix bad merge 2023-03-06 14:29:09 +05:00
Elyor Djalilov
fdaf0aa9e9 Merge branch 'develop' into bugfix/61157
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
2023-03-06 14:20:25 +05:00
83c03823aa Fix confirmLink activeEmail 2023-03-06 12:35:49 +04:00
f9d7ab1c72
Merge pull request #1283 from ONLYOFFICE/bugfix/toolbar-viewer
Bugfix/toolbar viewer
2023-03-06 11:16:45 +04:00
2a503cfc47 Merge branch 'develop' into feature/send-again 2023-03-06 10:59:42 +04:00
Akmal Isomadinov
7ee3770bd2 Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed the wheel event and removed useless code 2023-03-06 11:59:41 +05:00
Akmal Isomadinov
ff18523e43 Web:Common:Components:MediaViewer:Sub-Components Fixed the zoom value in the toolbar 2023-03-06 11:21:28 +05:00
6cf2a16c39 Merge branch 'develop' into feature/send-again 2023-03-05 12:18:02 +03:00
bfeda8f9e9 Web:Client:Fixed styles because the send link again did not fit in the plate. 2023-03-05 12:17:42 +03:00
b341ddfb62 Fix socket operations 2023-03-05 11:39:44 +04:00
6934ee79bc thumbnails: refactoring, optimization 2023-03-04 19:58:45 +03:00
Elyor Djalilov
44c04c5131 Web: PortalSettings: fix appearance color 2023-03-04 19:44:39 +05:00
Elyor Djalilov
668be2e17d Web: PortalSettings: fix single sign-on fields 2023-03-04 13:10:53 +05:00
Elyor Djalilov
4cecc2c3a9 Web: PortalSettings: fix styles 2023-03-04 11:36:04 +05:00
Elyor Djalilov
728ba4ea5b Web: PortalSettings: fix automatic backup fields 2023-03-04 11:19:06 +05:00
Elyor Djalilov
6ded261462 Web: PortalSettings: fix company logos 2023-03-04 10:18:44 +05:00
84d102c1af fix Bug 61465 - Accounts. Two-factor authentication. 2023-03-04 00:57:15 +03:00
f95c56198e thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring 2023-03-03 22:49:36 +03:00
f8af64e9d6 ASC.Common.Threading: extension for channel 2023-03-03 22:00:20 +03:00
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
792ba4c69a
Merge pull request #1227 from ONLYOFFICE/feature/fix-back-button-rooms
Browser back button fix
2023-03-03 18:48:40 +04:00
c91f6c9e5d Merge branch 'develop' into feature/fix-back-button-rooms 2023-03-03 18:03:29 +04:00
5b1d952be2
Merge pull request #1261 from ONLYOFFICE/bugfix/oforms-context-info
Bugfix/oforms context info
2023-03-03 17:53:16 +04:00
964300cd19 Merge branch 'develop' into bugfix/oforms-context-info 2023-03-03 17:02:35 +04:00
b6b24fd4fc
Merge pull request #1280 from ONLYOFFICE/bugfix/fix-truncate-text
Bugfix/fix truncate text
2023-03-03 17:01:16 +04:00
3a58d3ee56
Merge pull request #1277 from ONLYOFFICE/bugfix/settings-backup
Bugfix/settings backup
2023-03-03 16:56:03 +04:00
e68e5a2cbb Web:Components:Fix missing text clipping if text is out of width. 2023-03-03 15:21:24 +03:00
c872fc0162 Web: Client: browserDetector: Fixed bug for detecting mobile app 2023-03-03 15:13:07 +03:00
68ce5c8764 Merge branch 'bugfix/settings-backup' of github.com:ONLYOFFICE/AppServer into bugfix/settings-backup 2023-03-03 14:46:21 +03:00
f4d8972358 Web: Renaming. 2023-03-03 14:46:01 +03:00
8acbf0bd64 Merge branch 'develop' into bugfix/settings-backup 2023-03-03 15:23:05 +04:00
Mushka Nikita
bc2eda8a4c fiixed erasure sorting 2023-03-03 14:21:25 +03:00
Mushka Nikita
00d44aad43 added russian translation to erasure functionality 2023-03-03 14:21:17 +03:00
4dbc7da238
Merge pull request #1279 from ONLYOFFICE/feature/reset-auth
Feature/reset auth
2023-03-03 15:09:26 +04:00
Viktor Fomin
b2edb13072 Client: AccountsHome: add ResetApplicationDialog 2023-03-03 14:03:32 +03:00
Viktor Fomin
c7aa870767 Client: init reset auth 2023-03-03 14:03:02 +03:00
Viktor Fomin
4d60816027 Client: ResetApplicationDialog: add success toast 2023-03-03 14:01:10 +03:00
Viktor Fomin
c6e1c58e97 Client: add translates 2023-03-03 14:00:53 +03:00
Mushka Nikita
5171aeceb8 fiixed infoPanel closing on category switch 2023-03-03 13:34:03 +03:00
96f19a78c1
Merge pull request #1275 from ONLYOFFICE/feature/refactoring-viewer-base
Feature/refactoring viewer base
2023-03-03 14:22:30 +04:00
3448048b2b Web: PortalSettings: Restore: Deleted useless code. 2023-03-03 13:06:21 +03:00
d49f5ead91 Web: PortalSettings: Deleted useless code. 2023-03-03 12:56:38 +03:00
Akmal Isomadinov
e6fe2125d8 Web:Common:Components:MediaViewer:Sub-Components:ImageViewerToolbar Fixed a typo in the file name 2023-03-03 14:55:55 +05:00
f8000cdc2a Web: PortalSettings: Backup: Fixed component display by direct url. 2023-03-03 12:54:22 +03:00
Akmal Isomadinov
63821e70f3 Web:Common:Components:MediaViewer:Sub-Components Correcting the function name and casting a single style 2023-03-03 14:52:17 +05:00
Akmal Isomadinov
fbab03fa5e Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed a typo in the function name 2023-03-03 14:41:59 +05:00