|
|
6d6116c5ce
|
merge from develop
|
2023-09-22 13:39:24 +03:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
91e359f834
|
Merge pull request #1743 from ONLYOFFICE/feature/urlShortener
update urlShortener
|
2023-09-20 02:39:22 -07:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
f6c1406cea
|
fix urlShortener
|
2023-09-19 19:42:01 +03:00 |
|
|
|
878bf35ce7
|
execute delete in SaveAsync
|
2023-09-19 17:00:54 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
e5456ba9c6
|
Execute delete in RemoveUserAsync and RemoveUserGroupRefAsync
|
2023-09-19 12:23:42 +03:00 |
|
|
|
f39bcab58f
|
executedelete in RemoveGroupAsync
|
2023-09-19 11:36:31 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
c56264e54e
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-09-18 21:41:09 +03:00 |
|
|
|
47bfa5c50c
|
ASC.Notify.Textile: ar-SA direction rtl
|
2023-09-18 17:06:13 +03:00 |
|
|
|
377be3c570
|
ASC.Notify.Textile: csproj fixed
|
2023-09-18 17:00:39 +03:00 |
|
|
|
18c0916338
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/rtl-direction-fix
|
2023-09-18 16:48:11 +03:00 |
|
|
|
c1ee4f0d36
|
ASC.Notify.Textile: revert rtl changes
|
2023-09-18 16:47:25 +03:00 |
|
|
|
2331eee1ed
|
revert 9ab54eba47
|
2023-09-18 16:37:40 +03:00 |
|
Viktor Fomin
|
4d2f9327ab
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 12:07:24 +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 |
|
|
|
ed8c4707a3
|
Merge branch 'feature/split-invite' of github.com:ONLYOFFICE/DocSpace into feature/split-invite
|
2023-09-14 17:38:05 +03:00 |
|
|
|
68a88058cb
|
added room id
|
2023-09-14 17:35:54 +03:00 |
|
|
|
6624a46d46
|
ASC.Data.Reassigns: ReassignProgressItem: tracking CancellationToken status
|
2023-09-14 14:32:57 +03:00 |
|
|
|
7aff59b652
|
update urlShortener
|
2023-09-13 16:49:29 +03:00 |
|
|
|
57fc34a966
|
ASC.Notify.Textile: TextileStyler: newlines fixed
|
2023-09-13 16:11:29 +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 |
|
|
|
bd1e54a1af
|
disable punctuation tests
|
2023-09-13 14:21:13 +03:00 |
|
diana-vahomskaya
|
9ab54eba47
|
fix resources in another languages
|
2023-09-13 13:49:32 +03:00 |
|
|
|
ea2bd6a12d
|
Merge branch 'develop' into feature/optimization-ef
|
2023-09-13 12:28:33 +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 |
|
|
|
eee5f2d443
|
ef fix: update and traking
|
2023-09-12 18:23:45 +03:00 |
|
diana-vahomskaya
|
458ca824be
|
fix
|
2023-09-12 17:07:01 +03:00 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
a471496cf7
|
fix cleaner
|
2023-09-12 15:37:20 +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 |
|
|
|
99b089fe64
|
ef default: as no traking
|
2023-09-12 14:47:43 +03:00 |
|
|
|
84067d4dd0
|
ASC.Data.Reassigns: fixed data reassignment without profile deletion
|
2023-09-12 01:39:51 +03:00 |
|
|
|
166208565f
|
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
|
2023-09-11 07:33:57 -07:00 |
|
|
|
5977a9f986
|
Merge pull request #1719 from ONLYOFFICE/feature/json-7
Feature/json 7
|
2023-09-11 07:33:28 -07:00 |
|
diana-vahomskaya
|
af8bd48f3a
|
fix
|
2023-09-11 15:55:50 +03:00 |
|
diana-vahomskaya
|
4ecd7877b8
|
fix culture.Name == "ar-SA" to culture.TextInfo.IsRightToLeft
|
2023-09-11 15:23:29 +03:00 |
|
|
|
00a9b332df
|
Merge pull request #1727 from ONLYOFFICE/feature/accounts-optimization
Feature/accounts optimization
|
2023-09-11 04:36:07 -07:00 |
|
diana-vahomskaya
|
243bc79eca
|
added direction rtl or ltr for letters depending on culture, added text-align Left or Right depending on culture in TextileStyler.cs
|
2023-09-11 14:01:43 +03:00 |
|
|
|
dec1a0d2e5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-10 18:11:26 +03:00 |
|
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
|
|
7bd76d4782
|
added ar
|
2023-09-08 17:12:01 +03:00 |
|
|
|
2283184a61
|
removed Serializable attribute
|
2023-09-08 16:24:24 +03:00 |
|
|
|
739356d13f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-08 15:12:10 +03:00 |
|
