Commit Graph

31771 Commits

Author SHA1 Message Date
32b4bc6afd
Merge pull request #1288 from ONLYOFFICE/bugfix/fixed-loader-blinking
Web: Client: added a small delay to the loader so that there is no fl…
2023-03-06 23:04:27 +04:00
bdd62c5a43 Merge branch 'develop' into bugfix/fixed-loader-blinking 2023-03-06 23:03:03 +04:00
0997066c98
Merge pull request #1208 from ONLYOFFICE/bugfix/61157
Bugfix/61157
2023-03-06 23:02:08 +04:00
0895fa8020 revert chunk size to 10MB 2023-03-06 18:39:57 +03:00
6b2434eb28 Web:Client:Fix back button. 2023-03-06 18:05:23 +03:00
Vashchuk Nikita
ca8c737b4f small fix MessageAction after merge 2023-03-06 19:17:39 +05:00
DmitrySychugov
daf38f640c Web: Client: added a small delay to the loader so that there is no flickering 2023-03-06 19:06:57 +05:00
626bb741b5 Merge branch 'develop' into bugfix/61157 2023-03-06 17:34:37 +04:00
378407686c
Merge pull request #1287 from ONLYOFFICE/bugfix/additional-resources-buttons
Bugfix/additional resources buttons
2023-03-06 17:32:20 +04:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
cbc8d7b2d5
Merge pull request #1286 from ONLYOFFICE/bugfix/fixed-files-upload
Web: Files: fixed files upload
2023-03-06 15:11:16 +03:00
668a1c6258 Web: Files: fixed conversion 2023-03-06 14:29:39 +03:00
90c9fa1a0c Web:Client:Fix the lack of buttons if the settings are not paid. 2023-03-06 14:28:41 +03:00
4dc7f259b8
Merge pull request #1281 from ONLYOFFICE/feature/send-again
Feature/send again
2023-03-06 15:23:03 +04:00
d66a8cb4ac Update Common.json 2023-03-06 15:21:22 +04:00
a26384cc96 Web: Files: fixed files upload 2023-03-06 14:17:21 +03:00
977ef4f43a Merge branch 'develop' into feature/send-again 2023-03-06 15:12:02 +04:00
8d45abeffe Merge branch 'feature/send-again' of github.com:ONLYOFFICE/AppServer into feature/send-again 2023-03-06 13:21:45 +03:00
b219ebb07b Web:Client:Fix styles. 2023-03-06 13:21:37 +03:00
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