Commit Graph

31635 Commits

Author SHA1 Message Date
2d83a0df66 Web: Deleted useless translations. 2023-03-09 18:36:15 +03:00
8790582db2 Web: Deleted useless translation after merge. 2023-03-09 18:24:59 +03:00
0947e1d67a Web: Deleted useless translation after merge. 2023-03-09 18:22:23 +03:00
Vashchuk Nikita
492d8765cb added collaborator resources 2023-03-09 17:39:38 +05:00
Vashchuk Nikita
8bbdeffa46 changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName 2023-03-09 16:40:36 +05:00
Vashchuk Nikita
5860c24c84 enable RoomsActivity subscription for all new users 2023-03-08 21:01:44 +05:00
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +05:00
Vashchuk Nikita
4f4b4c06c2 added check roomsActivity subscription when send mentions,
added check general notification settings to determine mute attribute
2023-03-07 15:23:07 +05:00
Vashchuk Nikita
ca8c737b4f small fix MessageAction after merge 2023-03-06 19:17:39 +05: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
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
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
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