Commit Graph

10566 Commits

Author SHA1 Message Date
7ae8cbc5a6 Files: added additional parameter for link 2022-12-08 14:57:36 +03:00
33de49463a People: fix permissions checking 2022-12-08 14:56:05 +03:00
6b2b7cbf0c Files: fix duplicating tags 2022-12-08 13:46:50 +03:00
9b0082b23f Files: added deleting unused tags 2022-12-08 13:46:37 +03:00
6aaa58c237 Files: fix tag new 2022-12-08 13:10:37 +03:00
ac1c2beb20 Files: added deleting pin after archiving 2022-12-08 11:27:02 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
04a092782c Files: new tag for folder 2022-12-07 16:36:58 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
721f50e95d Files: fix new tag 2022-12-07 10:53:45 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
837cee5b8f People: changed permissions validation logic 2022-12-06 01:57:55 +03:00
094e8d41ff Merge branch 'develop' into feature/room-admin-permissions 2022-12-05 11:15:15 +03:00
2b7ece7553 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-30 18:41:02 +03:00
eee9c05d9a ASC.Web.Core: Notify: fix email templates 2022-11-30 18:40:01 +03:00
fbfd9daa46 Merge branch 'develop' into feature/socket-newtag 2022-11-30 18:37:34 +03:00
3a927973e3
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
Feature/users payments filter
2022-11-29 23:31:37 +04:00
bacde66b72 Merge branch 'develop' into feature/users-payments-filter 2022-11-29 22:24:50 +03:00
a886b1b802
Merge pull request #1019 from ONLYOFFICE/feature/subject-filter
Feature/rooms subject filter
2022-11-29 22:58:11 +04:00
c32e90f9ef People: changed validation 2022-11-29 11:59:33 +03:00
475deff8b9 People: added option to disable validation 2022-11-29 11:52:59 +03:00
083eaeac4c Files: updated filter by subject for rooms 2022-11-28 11:37:34 +03:00
cc77986859 Files: folders renamed 2022-11-25 18:07:47 +03:00
49dd8f538e DocSpace: hide recent and favorites 2022-11-25 17:44:15 +03:00
4a0bb69db9 Merge branch 'develop' into feature/subject-filter 2022-11-25 13:21:40 +03:00
130532927b Merge branch 'develop' into feature/socket-newtag 2022-11-24 17:56:32 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
2b9446dc26 fix startup 2022-11-23 12:17:08 +03:00
7132f3e351 fix 2022-11-21 16:35:20 +03:00
56e0760f96 Files: fix CORS 2022-11-21 11:07:17 +03:00
9a03f19b62 add semaphore 2022-11-19 05:40:13 +03:00
e940da5480 fix fileOperation 2022-11-19 05:40:00 +03:00
2f7fdaf00a
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
2022-11-16 18:24:29 +03:00
782b928ef0 People: allowNotPayment 2022-11-16 18:14:47 +03:00
d509f1e31b fix FileMoveCopyOperation 2022-11-16 14:36:30 +03:00
ca5e0e4d1e fix 2022-11-16 11:18:24 +03:00
f974bb0655 fix 2022-11-15 19:30:52 +03:00
7d9d8fcba3 Files: tag dao. Async 2022-11-15 19:10:39 +03:00
e5863dddcc fix 2022-11-15 17:07:51 +03:00
e17ef78c00 fix 2022-11-15 14:22:53 +03:00
00bc874422 Files: Socket. remove tags 2022-11-14 20:21:49 +03:00
4432bf7d22 Socket: async, refactoring
Files: markasnew
2022-11-13 20:33:19 +03:00
13eb4fec1b People: added filtering users by paid 2022-11-10 17:14:03 +03:00
a3832db2f6 Files: added filtering by member for administrator 2022-11-10 15:15:50 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
a9fc7a14ed Removed old code 2022-11-08 13:57:51 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00