Commit Graph

1371 Commits

Author SHA1 Message Date
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
eab3a9b2bd Files: fixed download 2020-05-06 19:55:10 +03:00
c077f0d1d4 Files: added SecurityInfoModel 2020-05-06 18:10:27 +03:00
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
79e2387da4 Files: fixed trash folder 2020-05-06 10:20:10 +03:00
1a269749fc Files: fix removing 2020-04-30 16:34:15 +03:00
bac295c589 Files: fix remove operation 2020-04-30 14:09:27 +03:00
9a7d7ac7c6 Files: fixed transaction 2020-04-30 11:56:55 +03:00
7ffd2c702f Files: search 2020-04-29 19:01:38 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
b9a432cb89 Files: removed FilesWrapper, FolderWrapper 2020-04-28 20:32:51 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
c51b40247a Files: service replaced 2020-04-27 20:02:15 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
bc4a479fc6 Files: DocuSignHandler 2020-04-20 15:32:24 +03:00
c40acf19fb Files: ThirdPartyAppHandler 2020-04-20 15:08:24 +03:00
eef99a3e96 Files: ChunkedUploaderHandler 2020-04-20 11:08:04 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
0d6acd74fb Files: fix thirdparty 2020-04-16 13:33:58 +03:00
d873e73304 Files: fix upload 2020-04-16 11:50:52 +03:00
22652fbd13 Files: thirdparty fix 2020-04-16 10:14:24 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
ae0b217172 Files: FileHandler 2020-04-13 14:46:26 +03:00
Ilya Oleshko
f96db8dd51 Files: added property DisableFormat for string format 2020-04-02 15:05:53 +03:00
Ilya Oleshko
a9ff193903 Files: fixed property name 2020-04-02 14:21:05 +03:00
Ilya Oleshko
f4f6ec9054 Files: fixed missing after merge 2020-04-02 14:19:38 +03:00
bac73b4762 Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-03-25 17:07:48 +03:00
674ae9b412 Files: Download operation 2020-03-25 17:04:02 +03:00
b62bdc6938 Files: MarkAsRead operation 2020-03-25 11:08:31 +03:00
7784c65bfb Files: fixed removing folder 2020-03-24 17:03:48 +03:00
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30:16 +03:00
4eab409bef Files: delete operation 2020-03-20 17:35:51 +03:00
4dfdca6bea Files: CrossDao 2020-03-20 16:05:34 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
7862ed159d Files: fix merge 2020-03-19 16:18:35 +03:00
978cf0e34e Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
2020-03-19 16:07:16 +03:00
50c745dbd0 Files: ComposeFileOperation 2020-03-19 15:56:34 +03:00
25de308530 Files: added withSubFolders 2020-03-18 18:03:33 +03:00
566eaa1a80 Files: fixed saveFolder 2020-03-18 17:41:35 +03:00
cb77ce4857 Files: fixed RecalculateFoldersCount 2020-03-18 16:51:36 +03:00
4a543560a7 Files: api 2020-03-18 16:19:37 +03:00
98eb263efd Files: thirdparty. Fix 2020-03-17 17:47:39 +03:00
fad1f8255c Files: thirdparty 2020-03-17 15:49:14 +03:00
ff36878397 Files: thirdparty refactoring 2020-03-17 10:48:33 +03:00
8f455e388f Thirdparty: refactoring 2020-03-16 18:34:51 +03:00
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
dependabot[bot]
3e25e5c6de
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:54:24 +00:00
b3fbe38090 Files: fixed search 2020-03-13 17:36:18 +03:00
add68d36d4 Files: sharpbox 2020-03-13 16:40:58 +03:00
Daniil Senkiv
79f1f859b1 Files: fix returning items count 2020-03-13 15:38:09 +03:00
2241198a81 Files: Thirdparty. Onedrive, sharepoint 2020-03-13 10:37:42 +03:00
c7dab9943f Files: GoogleDrive 2020-03-12 14:29:36 +03:00
10931faf92 Files: box 2020-03-11 18:39:48 +03:00
314c2f9198 Files: added ProviderFileDao, ProviderFolderDao 2020-03-10 18:54:08 +03:00
03bb507d86 Files: added ProviderSecurityDao 2020-03-10 16:31:53 +03:00
f0111a72a0 Files: fixed get @share 2020-03-06 17:15:39 +03:00
6ccfbec3b0 Files: fixed remove folder 2020-03-06 16:48:04 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
ae9a5003f3 Files: refactoring 2020-03-05 10:24:50 +03:00
ece437cbc0 Files: refactoring 2020-03-04 17:40:05 +03:00
c3dd78047a Files: refactoring 2020-03-04 13:30:29 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
38eefb5a20 Files: refactoring 2020-03-03 14:37:40 +03:00
aa9577e5c0 Files: template methods 2020-03-02 15:31:53 +03:00
8e06c42740 Files: added new interface 2020-02-28 14:32:11 +03:00
697b03ab6f Files: fixed @share 2020-02-27 18:25:59 +03:00
4e0fef6c95 Files: Fixed product path 2020-02-27 13:46:16 +03:00
3ac06f934d Files: fix 2020-02-27 11:51:05 +03:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +03:00
190341c716 Files: renamed filescontroller 2020-02-27 11:22:42 +03:00
cae7c0f8c1 Web: People: fixed translation files 2020-02-27 11:12:11 +03:00
00e5f0c9cf Web: People: added truncate prop to checkbox, added border to users list container 2020-02-26 16:18:55 +03:00
888d735790 Web: People: fixed user list styles 2020-02-26 15:35:12 +03:00
d33895d8d5 Web: People: added custom scroll to list users 2020-02-26 15:26:54 +03:00
dcff29c806 File: FileStorageService renamed 2020-02-26 14:52:55 +03:00
1b4198b36d Files: ProductEntryPoint 2020-02-26 14:34:27 +03:00
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
a78dad4064 web: files: Fixed proxy configure for images and socketjs 2020-02-26 11:04:26 +03:00
044147baa4 web: files: Added nav.log svgs 2020-02-26 11:02:55 +03:00
1bc8f58df4 Merge branch 'master' into feature/user-actions-changes 2020-02-26 10:55:17 +03:00
ac5017da99 Merge branch 'master' into feature/elastic
# Conflicts:
#	build/build.bat
#	build/rebuild.bat
2020-02-26 10:46:37 +03:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
30dbb2a6ca Web: People: added send email function 2020-02-25 16:58:34 +03:00
935772d783 Web: People: renamed DeleteGroupUsersDialog to DeleteUsersDialog 2020-02-25 16:20:48 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
31dc839d22 web: Files: Fixed load Files home page 2020-02-25 14:47:50 +03:00
48513d7356 Web: People: renamed an array of users 2020-02-25 14:20:35 +03:00
fa4a088692 Web: People: fixed onChange checkbox function 2020-02-25 14:18:28 +03:00
e476681495 Web: People: added display of all users in the list in DeleteGroupUsersDialog, fixed display of the list of users 2020-02-25 13:14:44 +03:00
d9522e48ef Web: People: added display of all users in the list in ChangeUserStatusDialog, fixed display of the list of users 2020-02-25 11:58:04 +03:00
ce312b16c1 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-25 11:56:50 +03:00
af40cd8ca7 web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined 2020-02-25 11:56:41 +03:00
8737369a1c Web: People: added display of all users in the list in ChangeUserTypeDialog, fixed display of the list of users 2020-02-25 11:35:34 +03:00
ee31bb29b5 Web: People: fixed dialog class names 2020-02-25 11:32:17 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
c02a987d36 web: files: Fixed PUBLIC_URL 2020-02-25 11:13:39 +03:00
7942dbadf8 web: files: Added Module images 2020-02-25 11:13:08 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
707e0bbf82 Web: People: added display of all users in the list in SendInviteDialog, fixed display of the list of users 2020-02-25 10:51:27 +03:00
af7ac989a6 Web: People: modified sending users to dialogs 2020-02-25 10:47:40 +03:00
a452774b8b Web: People: added getUsersIds selector 2020-02-25 10:44:08 +03:00
4ca24f0077 Files: Init Files.Client 2020-02-25 09:58:09 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
c0cc5cc188 Web: People: dialog message translations fixed 2020-02-21 11:57:47 +03:00
356e1d48ec Web: People: fixed send email header 2020-02-21 11:33:55 +03:00
a9f64e474f Merge branch 'master' into feature/user-actions-changes 2020-02-21 10:20:16 +03:00
28e94c16fc Web: People: fixed closing group button menu 2020-02-21 10:18:20 +03:00
7429478e2c Web: People: added new translations 2020-02-21 09:08:53 +03:00
41b943062a Web: People: removed unused translations 2020-02-21 09:06:58 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
c05fd0bfe7 Web: People: fixed change user type error 2020-02-20 16:14:33 +03:00
dd6ac76105 Web: People: added new translations 2020-02-20 16:05:36 +03:00
a1efaa4c17 Web: People: added change user type dialog 2020-02-20 15:55:25 +03:00
43bdd40f46 Web: People: removed unused getSelectionIds function, fixed getUserType function 2020-02-20 15:50:33 +03:00
c9689bc7df Web: People: rename DeleteGroupUsersShowUsers to ShowUsersList 2020-02-20 15:49:22 +03:00
65fa34dff4 Web: People: added change user status dialog 2020-02-20 14:13:54 +03:00
6c7145f32e Web: People: removed set disabled dialog 2020-02-20 14:12:42 +03:00
f2dd97824d Web: People: added new disable users dialog 2020-02-20 11:24:53 +03:00
e0e7803e56 Web: People: fixed users dialogs 2020-02-20 11:23:27 +03:00
f135a022d3 Web: People: fixed selectors functions 2020-02-20 11:22:23 +03:00
9ef838e8fc Web: People: refactoring delete group users dialog 2020-02-20 09:28:58 +03:00
7ada48f0bc Web: People: added send invite dialog to group users 2020-02-20 09:26:51 +03:00
05954f21e0 Web: People: added new translations to resourceConfig 2020-02-19 16:09:54 +03:00
a8eb7d8b1b Web: People: added delete group users warning dialog 2020-02-19 16:08:57 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
68e1a6a6a0 Web: People: added disabling action fields in the group buttons menu 2020-02-19 10:32:51 +03:00
fa1bde3742 Web: People: change title of pages, added new translations 2020-02-18 13:16:01 +03:00
Ilya Oleshko
b68ea6335c People.Client: Home: Fixed width for Row sub components 2020-02-18 12:06:18 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
39db07a4a8 Web: People: fixed clickability of a link to groups in a tree 2020-02-17 17:29:24 +03:00
785f002c4d Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-17 16:50:49 +03:00
82380e35e9 Web: People: change title of pages 2020-02-17 16:50:19 +03:00
Ilya Oleshko
289c9e7807 People.Client: Home: Fixed context options array 2020-02-17 15:29:03 +03:00
31526c5e48 Web: People: fixed groups tree links 2020-02-17 13:43:13 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
2c024ca787 Web: People: fixed profile rerender after click on user 2020-02-17 11:08:46 +03:00
d9468384a6 Web: People: added links to users list 2020-02-17 09:50:00 +03:00
933bf17f4e Web: People: added links to groups in the tree 2020-02-17 08:55:23 +03:00
b550a776a9 Web: People: added logo icons 2020-02-14 16:05:12 +03:00
42171afc48 Web: People: fixed updated filter after selecting a group 2020-02-14 14:51:08 +03:00