Commit Graph

3707 Commits

Author SHA1 Message Date
Ilya Oleshko
7a06630e34 web: common: bump version 2020-03-05 09:18:08 +03:00
Ilya Oleshko
da17495699 Web: Common: Api: Files: Fixed api data 2020-03-05 09:15:27 +03:00
a7069aa19d web: common: bump version 2020-03-04 16:23:14 +03:00
22e2729cc5 Web: Files: fixed merge 2020-03-04 16:22:56 +03:00
ed9c15864a web: common: bump version 2020-03-04 15:47:54 +03:00
fcd9da1dc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
# Conflicts:
#	web/ASC.Web.Common/src/api/files/filter.js
2020-03-04 15:47:31 +03:00
bcbe88caab Web: Common: added treeFolders field to filter 2020-03-04 15:40:02 +03:00
Daniil Senkiv
253752fbfc web: common: bump version 2020-03-04 14:49:13 +03:00
Daniil Senkiv
ffff9d38b8 Web.Common/Files: FilesFilter: add authorType 2020-03-04 14:49:01 +03:00
67521344e0 web: components: bump version 2020-03-04 13:22:12 +03:00
10998c67e5 Web: Components: added loadData prop to tree-menu 2020-03-04 13:21:52 +03:00
7ef15cb51d web: components: bump version 2020-03-04 09:17:35 +03:00
cdaf42ad6b Web: Components: fixed tree-menu tests 2020-03-04 09:11:17 +03:00
e109a7d043 web: components: bump version 2020-03-04 08:55:15 +03:00
Daniil Senkiv
b23b820d60 web: common: bump version 2020-03-03 09:30:42 +03:00
Daniil Senkiv
5442438698 Web.Files: Filter: add first version of FilesFilter 2020-03-03 09:30:27 +03:00
Ilya Oleshko
b89bc4723c web: common: bump version 2020-03-02 17:09:08 +03:00
Ilya Oleshko
b044b545d0 Web: Common: Api: Files: Added getFileInfo, getFolderPath, createTextFileInCommon, getFileInfo, updateFile, createFolder and renameFolder api requests 2020-03-02 17:08:53 +03:00
Ilya Oleshko
034f426a4d web: common: bump version 2020-03-02 13:48:24 +03:00
Ilya Oleshko
52bf9ac9e0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-02 13:48:09 +03:00
Ilya Oleshko
97fa98857e Web: Common: Api: Files: Added getFolder by folder id 2020-03-02 13:47:51 +03:00
7fc33a282b Web: Common: added getSharedFolderList fake api 2020-03-02 12:30:47 +03:00
Ilya Oleshko
948d43a05d web: common: bump version 2020-03-02 11:25:30 +03:00
Ilya Oleshko
f80ab0b473 Web: Common: Api: Files: Disabled fakeApi for trash folder 2020-03-02 11:25:26 +03:00
Ilya Oleshko
336561c86f web: common: bump version 2020-03-02 11:17:58 +03:00
Ilya Oleshko
2a9c57d06e Web: Common: Api: Files: Added createTextFile and createTextFileInMy 2020-03-02 11:17:32 +03:00
df6d25f4a9 Web: Components: renamed onBadgeClick function updated README.md file 2020-03-02 09:47:58 +03:00
Ilya Oleshko
6a14d0978f web: common: bump version 2020-02-28 17:26:24 +03:00
Ilya Oleshko
e543f00b17 web: common: bump version 2020-02-28 17:21:26 +03:00
Ilya Oleshko
49845fbb6c Web: Common: Api: Files: Added getCommonFolderList and getProjectsFolderList 2020-02-28 17:21:15 +03:00
Ilya Oleshko
3f2baee4cb web: common: bump version 2020-02-28 16:08:14 +03:00
Ilya Oleshko
e35df76d90 Files.Client: Home: Fixed fake folderApi. Added @my and @trash api. 2020-02-28 16:08:03 +03:00
Ilya Oleshko
c691ef3e7d web: common: bump version 2020-02-28 13:33:33 +03:00
Ilya Oleshko
22650be927 Files.Client: Home: Added Row and fakeApi 2020-02-28 13:33:13 +03:00
77e9967714 Web: Components: added Badge to tree-menu 2020-02-27 17:33:17 +03:00
Daniil Senkiv
91d7e28b25 Files.Client: Article: add MainButton elems 2020-02-27 16:21:20 +03:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +03:00
97ae3914c5 web: common: bump version 2020-02-26 16:32:24 +03:00
68395a16aa web: components: bump version 2020-02-26 16:32:14 +03:00
e57e8ff935 web: files: Replaced fake product 2020-02-26 11:06:44 +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
b5bc446cc3 Merge branch 'master' into feature/user-actions-changes 2020-02-25 13:16:02 +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
Daniil Senkiv
1ae795a86b web: common: bump version 2020-02-21 14:14:13 +03:00
Daniil Senkiv
b724548e98 web.common: fix working web.client, if api people not available 2020-02-21 14:13:45 +03:00
Daniil Senkiv
a1d249be68 web.common: fix problem with handling idle modules 2020-02-21 14:11:33 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00