Commit Graph

22968 Commits

Author SHA1 Message Date
ce1917c77f Async: refactoring 2022-08-03 17:29:20 +03:00
bb80d28945 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
2022-08-02 17:03:50 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
a12d0b5609 Web: Temporary removed auto-changelog and debug-info 2022-08-01 20:26:19 +03:00
271b6b3bad Web: Update auto-changelog and yarn.lock 2022-08-01 19:48:05 +03:00
27fa822017 Web: Commented useless code 2022-08-01 19:47:29 +03:00
865bc438cd
Merge pull request #748 from ONLYOFFICE/refactoring/client
Refactoring/client
2022-08-01 18:57:18 +03:00
72878d5ca8 Web: Fix open NavMenu on Mobile 2022-08-01 18:47:11 +03:00
ac3683d7ab Web: Fix i18n ns name for Files.json 2022-08-01 18:12:15 +03:00
af5cfe6553 Web: Rename translation file on 'en' 2022-08-01 18:03:27 +03:00
1f17ab9231 Nginx: Restored files handlers 2022-08-01 17:53:57 +03:00
ebc6ce1d67 Web: Commented console logs 2022-08-01 17:53:26 +03:00
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
c39b845da9 Build: Removed old fix path commands 2022-08-01 16:56:45 +03:00
a14c0f74d5 Nginx: Removed old files/people configs 2022-08-01 16:55:44 +03:00
e9312097cc Nginx: Renamed onlyoffice-studio.conf to onlyoffice-client.conf 2022-08-01 16:55:11 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
07e8e49579 Web: Fix Frontend.Translations.Tests run 2022-08-01 15:55:39 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
fd21ad788c Web: Portal-Settings: Hide security/admins 2022-08-01 14:53:26 +03:00
3ed5ca8706 Web: Fix old url to /filter 2022-08-01 14:52:18 +03:00
58d3407729 fix 2022-08-01 13:58:14 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00
fa04e92286 Web: Added TODO: Change url by category 2022-08-01 13:30:26 +03:00
ec70758d79 Web: Fix some old urls to /filter 2022-08-01 13:29:27 +03:00
28d8c4b4a9
Merge pull request #746 from ONLYOFFICE/feature/pool-context
Feature/pool context
2022-08-01 13:15:10 +03:00
d406e8deb5 Merge branch 'develop' into feature/pool-context 2022-08-01 13:14:47 +03:00
b71611e272
Merge pull request #744 from ONLYOFFICE/feature/testShareRoomByLink
union tests GetLink and ShareRoomByLink
2022-08-01 12:59:19 +03:00
5c1fa45279 Merge branch 'develop' into feature/testShareRoomByLink 2022-08-01 12:54:26 +03:00
f2ae627ca0 fix api 2022-08-01 12:34:17 +03:00
b03f8bc1dc Merge branch 'develop' into feature/pool-context 2022-08-01 11:49:11 +03:00
d0289756ec Web: Changed routing by new categoryType 2022-07-31 20:14:28 +03:00
359c160ac1 Web: Refactoring routes urls 2022-07-31 13:52:35 +03:00
af8ebef56e Web: Removed ASC.Projects/Client 2022-07-31 13:16:31 +03:00
2c5da93540 Web: Removed ASC.Mail/Client 2022-07-31 13:15:59 +03:00
30031a8b52 Web: Removed ASC.CRM/Client 2022-07-31 13:15:29 +03:00
0a3ddbdb10 Web: Removed ASC.Calendar/Client 2022-07-31 13:14:59 +03:00
d0637936cb Web: Fix translation getDefaultFileName() 2022-07-31 13:13:16 +03:00
ca222f27dc .vscode: hidden /build/install 2022-07-31 13:12:26 +03:00
e0856c1503 Web: bootstrap: Commented registerSW 2022-07-31 12:53:20 +03:00
9890724990 Web: Accounts: Fix loaders 2022-07-31 12:52:53 +03:00
ef48119187 Update .yarn/install-state.gz 2022-07-29 22:38:54 +03:00
1ae3cce198 ASC.WebDav: Upgrade yarn to v3.2.2 2022-07-29 22:28:13 +03:00
5237c5ae98 ASC.UrlShortener: Upgrade yarn to v3.2.2 2022-07-29 22:26:54 +03:00
50ed43af17 ASC.SsoAuth: Upgrade yarn to v3.2.2 2022-07-29 22:25:53 +03:00
b2454b35ce ASC.Socket.IO: Upgrade yarn to v3.2.2 2022-07-29 22:24:09 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00