Commit Graph

37806 Commits

Author SHA1 Message Date
gazizova-vlada
600482c94d Web:Client:Fix. 2023-09-19 09:53:26 +03:00
gazizova-vlada
191a781225 Web:Fix. 2023-09-19 09:49:39 +03:00
gazizova-vlada
c34f60577d Web:Client:Add translation. 2023-09-19 09:08:14 +03:00
gazizova-vlada
21bd975674 Web:Client:Fix styles. 2023-09-19 08:58:04 +03:00
gazizova-vlada
4d1fc192d0 Web:Client:Change translation Account list to List accounts. 2023-09-18 18:43:18 +03:00
gazizova-vlada
be2861f110 Web:Client:Add timerId. 2023-09-18 18:38:34 +03:00
gazizova-vlada
f8d623d3ef Web:Add dataReassignmentUrl. 2023-09-18 18:17:02 +03:00
gazizova-vlada
34a7c068a7 Web:Client:Add onStartAgain, onTerminate. 2023-09-18 16:55:03 +03:00
d89137eced ASC.People: ReassignController: returning progress in a terminate method 2023-09-18 11:31:29 +03:00
80fb581d73 ASC.Data.Reassigns: ReassignProgressItem: throwing OperationCanceledException to OnCompleted 2023-09-15 12:02:53 +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
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
gazizova-vlada
a1f43d3cf0 Web:Client:Refactoring. 2023-09-13 18:40:05 +03:00
gazizova-vlada
dff945deaf Web:Client:Rename setDataReassignmentDeleteAdministrator in setIsDeleteUserReassignmentYourself. 2023-09-13 18:39:18 +03:00
gazizova-vlada
6c3ee273b6 Web:Common:Add DataReassignmentLoader. 2023-09-13 18:38:37 +03:00
ad93ede662 Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
2023-09-13 15:44:16 +03:00
c7162a24ca ASC.Files.Core: FileMarker: using ICacheNotify 2023-09-13 15:39:42 +03:00
c055184d87
Merge pull request #1742 from ONLYOFFICE/bugfix/disable-punctuation-tests
disable punctuation tests
2023-09-13 15:25:59 +04:00
bd1e54a1af disable punctuation tests 2023-09-13 14:21:13 +03:00
33d348e0c1
Merge pull request #1735 from ONLYOFFICE/bugfix/date-picker
Bugfix/date picker
2023-09-13 15:04:08 +04:00
f32ed269ed Merge branch 'develop' into bugfix/date-picker 2023-09-13 15:00:12 +04:00
463c2d81a2 Api: sso. hideAuthPage 2023-09-13 12:21:09 +03:00
a9e93ef2f9 fixed merge conflicts 2023-09-13 09:28:08 +03:00
9ca2280e83 fixed merge conflicts 2023-09-13 09:22:59 +03:00
c3495ce668
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
2023-09-13 09:21:59 +03:00
0c2c9511f4
Merge pull request #1733 from ONLYOFFICE/feature/back-ar
Feature/back ar
2023-09-12 19:43:24 +04:00
d8fc4babc7 Web: Removed full duplicate 2023-09-12 19:41:40 +04:00
bba582bde4 Create run.backend.translations.tests.sh 2023-09-12 19:41:06 +04:00
gazizova-vlada
4fe179cb7b Web:Client:Add Backdrop for PeopleSelector. 2023-09-12 18:07:02 +03:00
5be921b540 Merge branch 'develop' into feature/back-ar 2023-09-12 18:01:15 +04:00
d66954b45f
Merge pull request #1738 from ONLYOFFICE/feature/delete-dialog-translations
Web: Files: added new translations for delete dialog
2023-09-12 17:58:03 +04:00
b3470375cb Web: Fix translations to other languages 2023-09-12 17:57:27 +04:00
9c173f3d20 Web: Files: added new translations for delete dialog 2023-09-12 16:06:43 +03:00
675590854c Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
#	products/ASC.People/Server/Api/UserController.cs
2023-09-12 15:18:27 +03:00
e419f8ab40 added default link shortening 2023-09-12 14:54:59 +03:00
316d4742d6 Merge branch 'feature/reassign-data' of https://github.com/ONLYOFFICE/DocSpace into feature/reassign-data 2023-09-12 14:08:50 +03:00
9ac8a6bac1 ASC.Data.Reassigns: reset new tags when reassigning data 2023-09-12 14:08:41 +03:00
Vladimir Khvan
70ff42d9cd locale was passed to components 2023-09-12 15:46:17 +05:00
Vladimir Khvan
c7812b5fc8 Merge branch 'develop' into bugfix/date-picker 2023-09-12 15:22:34 +05:00
8283538b52
Merge pull request #1578 from ONLYOFFICE/feature/new-files-dialog
feature/new-files-dialog
2023-09-12 14:09:20 +04:00
gazizova-vlada
d0ce4eb38e Web:Client:Change MarkAsRead to Viewed. 2023-09-12 13:00:15 +03:00
gazizova-vlada
247c3d3dca Web:Client:Fix styles. 2023-09-12 12:58:34 +03:00
gazizova-vlada
bcb70fc787 Web:Client:Fix translation. 2023-09-12 12:05:59 +03:00
gazizova-vlada
e475a67f41 Web:Client:Add translation. 2023-09-12 11:53:12 +03:00
84067d4dd0 ASC.Data.Reassigns: fixed data reassignment without profile deletion 2023-09-12 01:39:51 +03:00
6cf75e74f8 Api: sso. HideAuthPage for anonymous 2023-09-11 17:55:57 +03:00
166208565f
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
2023-09-11 07:33:57 -07:00