|
|
26c6c5e252
|
fixed link shortening
|
2023-09-22 12:52:07 +03:00 |
|
|
|
68eda4bbb5
|
removed links templates
|
2023-09-22 12:49:44 +03:00 |
|
|
|
f7d4b5e556
|
pagination parameter nextPage replaced by total
|
2023-09-21 13:44:06 +03:00 |
|
|
|
c223e7bd30
|
pagination parameter nextPage replaced by total
|
2023-09-21 11:39:49 +03:00 |
|
|
|
32f1c003de
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-18 12:48:04 +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 |
|
|
|
122fd60af1
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-13 15:13:23 +04: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 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
e419f8ab40
|
added default link shortening
|
2023-09-12 14:54:59 +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 |
|
|
|
00a9b332df
|
Merge pull request #1727 from ONLYOFFICE/feature/accounts-optimization
Feature/accounts optimization
|
2023-09-11 04:36:07 -07:00 |
|
|
|
438366bf56
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-11 14:51:11 +04:00 |
|
|
|
0510210a7b
|
Merge pull request #1728 from ONLYOFFICE/bugfix/folder-restore
Bugfix/folder restore
|
2023-09-11 02:11:24 -07:00 |
|
gazizova-vlada
|
5cd7202515
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-11 11:58:06 +03:00 |
|
|
|
d3097f9cd9
|
Merge branch 'develop' into bugfix/room-filter
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-09-11 11:19:40 +03:00 |
|
|
|
bf9eae140f
|
fixed folder restore from trash
|
2023-09-11 11:16:24 +03:00 |
|
|
|
9de0cc2fbe
|
Generate logo for old rooms
|
2023-09-10 22:02:22 +03:00 |
|
|
|
bf0ef4cbd1
|
Files: logo colors moved to conf
|
2023-09-08 17:35:17 +03: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 |
|
|
|
37f59ea4f6
|
Socket: added FileEntryDtoContext
|
2023-09-08 11:39:14 +03:00 |
|
|
|
07aa2dda5a
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-09-08 10:47:32 +03:00 |
|
|
|
778a49ac8a
|
Merge branch 'develop' into feature/json-7
|
2023-09-07 17:55:51 +03:00 |
|
|
|
d7400c31bd
|
Merge pull request #1576 from ONLYOFFICE/feature/backup-s3-tar
Feature/backup s3 tar
|
2023-09-07 07:23:01 -07:00 |
|
|
|
2c53224c3f
|
Merge branch 'develop' into feature/backup-s3-tar
# Conflicts:
# common/ASC.Data.Storage/S3/S3Storage.cs
|
2023-09-07 17:10:28 +03:00 |
|
|
|
0610c91965
|
Merge pull request #1688 from ONLYOFFICE/feature/reference-data-improovement
reference data improovement
|
2023-09-07 17:00:57 +03:00 |
|
|
|
3913bf91b6
|
Rooms: generate random color for logo
|
2023-09-07 16:05:57 +03:00 |
|
|
|
b5c2572dbc
|
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back
Feature/adding translations back
|
2023-09-07 03:24:27 -07:00 |
|
|
|
28adddac03
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-07 10:24:17 +03:00 |
|
|
|
3f43b0b9c2
|
Merge pull request #1703 from ONLYOFFICE/feature/tag-new-optimization
feature/tag new optimization
|
2023-09-07 10:23:57 +03:00 |
|
|
|
6b35398c14
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-07 09:01:49 +03:00 |
|
|
|
c73e4f7a1d
|
rate limiter: max 10000 requests per user
|
2023-09-07 09:01:43 +03:00 |
|
|
|
c6d1b4e631
|
fixed filtering by room in trash
|
2023-09-06 13:50:48 +03:00 |
|
|
|
2792df1a84
|
added pt-PT
|
2023-09-05 17:23:59 +03:00 |
|
|
|
0369705ae3
|
Merge branch 'develop' into feature/accounts-optimization
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-05 11:22:06 +03:00 |
|
|
|
d864448da5
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
|
2023-09-04 23:01:50 +03:00 |
|
|
|
a40294f624
|
fixed tag new creating after copy
|
2023-09-04 20:11:09 +03:00 |
|
|
|
7f9286219c
|
optimized access check
|
2023-09-04 20:10:13 +03:00 |
|
|
|
e5b3d44bc3
|
fixed calculating hash
|
2023-09-04 19:55:54 +03:00 |
|
|
|
715c21f090
|
added ko, sk
|
2023-09-04 18:21:40 +03:00 |
|
|
|
63e0f44964
|
Merge branch 'develop' into feature/tag-new-optimization
|
2023-09-04 14:32:04 +03:00 |
|
|
|
e09e6cc3a6
|
refactoring
|
2023-09-04 13:39:15 +03:00 |
|
|
|
1f3d63be3d
|
optimized socket notification on tag changes
|
2023-09-04 13:20:32 +03:00 |
|
|
|
4439425625
|
fix Bug 63942
|
2023-09-01 16:00:56 +03:00 |
|
