|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
feb48c01a0
|
Files: moved from feature/editor-version-history
|
2021-12-08 15:25:39 +03:00 |
|
|
bff93c7141
|
moved from fc682b37
|
2021-12-03 18:28:20 +03:00 |
|
|
b1417e68ea
|
Files: fixed creating file from template in thirdparty
|
2021-12-03 17:38:13 +03:00 |
|
|
88c1f3271d
|
Files: fix copyAs
|
2021-11-29 17:52:50 +03:00 |
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
4f0edbe593
|
fix Bug 52983
|
2021-10-12 10:24:51 +03:00 |
|
|
9d76069ec8
|
fix Bug 52666
|
2021-09-30 09:52:46 +03:00 |
|
|
19bf04e461
|
fix Bug 52768
|
2021-09-29 19:08:30 +03:00 |
|
|
acded72c12
|
Files: fix upload files
|
2021-09-27 22:28:49 +03:00 |
|
|
bab3425bd1
|
Files: fix string ids
|
2021-09-24 21:40:29 +03:00 |
|
|
ac58470a1b
|
fix Bug 52594
|
2021-09-16 14:49:44 +03:00 |
|
|
a748b35f67
|
fix bug 51819.
Files: open edit. added view param
|
2021-09-15 13:26:56 +03:00 |
|
|
d19c16565d
|
Files: presigned url
|
2021-08-11 18:04:23 +03:00 |
|
|
e66f1f31bf
|
Files: added sync convert
|
2021-08-11 17:32:40 +03:00 |
|
|
dd64101332
|
remove itemList
|
2021-06-18 15:56:15 +03:00 |
|
|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +03:00 |
|
|
1b730233c9
|
ElasticSearch: moved from 08a01422
|
2021-05-23 19:11:25 +03:00 |
|
|
7e2a991eec
|
Files: fixed fileops/move
|
2021-04-15 21:43:12 +03:00 |
|
|
9b3d0b8d39
|
Files: fixed root query
|
2021-04-13 12:46:25 +03:00 |
|
|
b574424224
|
Files: added enableExternalExt when creating file
|
2021-03-29 15:06:51 +03:00 |
|
|
144a86fca7
|
Files: fix Deserialize
|
2021-01-13 13:49:52 +03:00 |
|
|
43bd3f6541
|
Files: openedit. EncryptionKeys
|
2020-12-29 16:04:50 +03:00 |
|
|
2fdcbee8ef
|
Files: pass CallbackUrl. Fix trackedit.
|
2020-12-25 23:25:37 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
|
34f8d17b84
|
Files: set files securityinfo
|
2020-12-03 17:43:33 +03:00 |
|
|
155b23f799
|
Files: GetSecurityInfo
|
2020-12-02 16:17:43 +03:00 |
|
Alexey Kostenko
|
23b209b85c
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-02 09:14:36 +03:00 |
|
|
303abad2a4
|
Files: change owner
|
2020-12-01 22:59:42 +03:00 |
|
Alexey Kostenko
|
7a95d4b942
|
Web: Files: Server: Added api setacelink
|
2020-11-30 18:34:45 +03:00 |
|
|
645749fbc7
|
Files: rename ParentFolderID to FolderId.
Optimization
|
2020-11-30 16:47:26 +03:00 |
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
|
6947185bab
|
Files: refactoring
|
2020-11-10 11:21:22 +03:00 |
|
|
2250baf7b7
|
Thirdparty: fix
|
2020-11-06 15:10:27 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
18ef6e7cb6
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-16 16:57:21 +03:00 |
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
|
b4a0a302e6
|
Files: fix di
|
2020-10-13 10:28:13 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
SuhorukovAnton
|
135a845eaf
|
fix-messages: IDE0063
|
2020-09-29 12:16:07 +03:00 |
|