|
715615813e
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-15 19:17:24 +04:00 |
|
|
c42072eb9e
|
Update yarn.lock
|
2023-09-15 19:16:55 +04:00 |
|
Viktor Fomin
|
157a3083c0
|
Client: Confirm: CreateUser: hide social sign up if email from link
|
2023-09-15 18:14:33 +03:00 |
|
Viktor Fomin
|
71e5179f64
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 18:12:30 +03:00 |
|
|
b9cb9507ec
|
fixed change owner
|
2023-09-15 18:07:19 +03:00 |
|
|
44bea3a535
|
Merge pull request #1635 from ONLYOFFICE/feature/cron
Feature/cron
|
2023-09-15 18:56:34 +04:00 |
|
|
c32c2b61f7
|
Web: Files: fixed translations
|
2023-09-15 17:56:05 +03:00 |
|
|
6580423517
|
Web: Components: Added margin to Cron story
|
2023-09-15 18:54:43 +04:00 |
|
|
7dd4deb420
|
Web: Components: Renamed folder Cron to cron (storybook sorting issue)
|
2023-09-15 18:52:01 +04:00 |
|
|
9b5572552e
|
Web: Fix ru translations
|
2023-09-15 18:28:31 +04:00 |
|
|
4ad47b9797
|
Merge branch 'develop' into feature/cron
|
2023-09-15 18:15:37 +04:00 |
|
|
6d47d23531
|
Merge pull request #1672 from ONLYOFFICE/bugfix/trash-navigation
Bugfix/trash navigation
|
2023-09-15 18:13:53 +04:00 |
|
|
05b8dc19b5
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-15 18:02:34 +04:00 |
|
|
479d6f7952
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
|
2023-09-15 16:54:31 +03:00 |
|
|
a5662b7cdd
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-09-15 16:54:26 +03:00 |
|
|
154c29c591
|
fix after merge
|
2023-09-15 16:52:50 +03:00 |
|
|
2b8821bcff
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/UserInvitationRequestDto.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
|
2023-09-15 16:45:49 +03:00 |
|
|
16e46e47fa
|
Files: owner becomes administrator after "change owner" operation
|
2023-09-15 16:41:53 +03:00 |
|
Viktor Fomin
|
4d2f9327ab
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 12:07:24 +03:00 |
|
Viktor Fomin
|
d4f3ebb987
|
Client: Confirm: CreateUser: fix ssoExist, add text via SSO
|
2023-09-15 12:07:13 +03:00 |
|
Viktor Fomin
|
6229112857
|
Client: add translate
|
2023-09-15 12:06:39 +03:00 |
|
|
80fb581d73
|
ASC.Data.Reassigns: ReassignProgressItem: throwing OperationCanceledException to OnCompleted
|
2023-09-15 12:02:53 +03:00 |
|
|
68f58e04fa
|
Merge pull request #1732 from ONLYOFFICE/feature/rtl-direction
feature/rtl-direction
|
2023-09-15 02:00:49 -07:00 |
|
Viktor Fomin
|
244c10bee1
|
Client: Confirm: add roomData
|
2023-09-15 11:55:13 +03:00 |
|
gazizova-vlada
|
cf930e37bc
|
Web:Client:Fix id to userId.
|
2023-09-15 11:31:42 +03:00 |
|
gazizova-vlada
|
e205fb5d78
|
Web:Client:Add onTerminate.
|
2023-09-15 10:32:12 +03:00 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
mushka-n
|
6b9e132ae4
|
upload form update (need to test, no cors)
|
2023-09-15 00:39:43 +03:00 |
|
|
907d6cb1de
|
Merge pull request #1745 from ONLYOFFICE/bugfix/mainbutton-submenu-blinking
Bugfix/mainbutton submenu blinking
|
2023-09-15 00:40:17 +04:00 |
|
|
46c6454d88
|
Web:Common:Section: fix padding for tablet and mobile window size
|
2023-09-14 19:26:49 +03:00 |
|
|
ed8c4707a3
|
Merge branch 'feature/split-invite' of github.com:ONLYOFFICE/DocSpace into feature/split-invite
|
2023-09-14 17:38:05 +03:00 |
|
|
9bc66531ed
|
added room name and id to validation response
|
2023-09-14 17:37:52 +03:00 |
|
|
9d22fc2ddd
|
added room id to link
|
2023-09-14 17:36:59 +03:00 |
|
|
68a88058cb
|
added room id
|
2023-09-14 17:35:54 +03:00 |
|
|
5925149e46
|
added getting provider by entity id
|
2023-09-14 17:33:58 +03:00 |
|
gazizova-vlada
|
34468a9ba4
|
Web:Client:Fix.
|
2023-09-14 15:50:23 +03:00 |
|
gazizova-vlada
|
4f517b5210
|
Web:Client:Fixed blinking of the loaded icon.
|
2023-09-14 15:44:53 +03:00 |
|
|
c151f16a79
|
Merge branch 'feature/reassign-data' of https://github.com/ONLYOFFICE/DocSpace into feature/reassign-data
|
2023-09-14 14:34:15 +03:00 |
|
|
2ea7dc058a
|
ASC.People: TaskProgressResponseDto: added status property
|
2023-09-14 14:34:06 +03:00 |
|
|
6624a46d46
|
ASC.Data.Reassigns: ReassignProgressItem: tracking CancellationToken status
|
2023-09-14 14:32:57 +03:00 |
|
DmitrySychugov
|
dd44682b3e
|
Merge branch 'develop' into bugfix/mainbutton-submenu-blinking
|
2023-09-14 15:52:26 +05:00 |
|
DmitrySychugov
|
5eba879ab9
|
Web: Components: fixed blinking submenu in mobile main button
|
2023-09-14 15:51:08 +05:00 |
|
Viktor Fomin
|
d363808d00
|
Merge branch 'develop' into feature/split-invite
|
2023-09-14 12:24:28 +03:00 |
|
|
f477080db2
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-14 13:20:17 +04:00 |
|
|
046d708214
|
Merge pull request #1734 from ONLYOFFICE/feature/add-new-link-dialog
Web: Files: Changed translations for add new link dialog
|
2023-09-14 13:17:07 +04:00 |
|
|
f05e79347f
|
Web: Files: fixed Save translation key
|
2023-09-14 12:09:03 +03:00 |
|
|
23202b8477
|
web: Files: fixed translation key
|
2023-09-14 12:04:19 +03:00 |
|
|
f577064e57
|
Web: Files: fixed page crash after resizing
|
2023-09-14 11:16:54 +03:00 |
|
|
c84eb55ff1
|
Merge branch 'develop' into feature/add-new-link-dialog
|
2023-09-14 11:12:17 +03:00 |
|
|
5ca957789e
|
Web: Client: hide built-in toast container in textarea to avoid double toast on the page
|
2023-09-13 18:17:24 +02:00 |
|