|
|
a11804b60d
|
temp fix. BinaryFormatter deprecated in .net 5
|
2021-04-02 21:48:40 +03:00 |
|
|
|
18b4fba15a
|
Merge branch 'develop' into feature/dotnet5
|
2021-03-31 20:38:05 +03:00 |
|
|
|
b574424224
|
Files: added enableExternalExt when creating file
|
2021-03-29 15:06:51 +03:00 |
|
|
|
65e1c72c01
|
Sln: fixed packages
|
2021-03-26 12:26:12 +03:00 |
|
|
|
18a2c0a53d
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
|
2021-03-25 21:50:09 +03:00 |
|
|
|
0a9a1b1809
|
Files: fixed root method
|
2021-03-22 22:14:43 +03:00 |
|
Diana
|
4e62f6a204
|
update migrations ef tools v.5.0.3
|
2021-03-09 20:56:57 +03:00 |
|
|
|
f734a91d82
|
Files: fix SaveEditing
|
2021-03-01 14:38:55 +03:00 |
|
|
|
7852dac3ca
|
Files: fix saveediting
|
2021-02-26 17:07:08 +03:00 |
|
|
|
b25dd2d6e2
|
.net 5
|
2021-02-25 12:02:28 +03:00 |
|
Ilya Oleshko
|
8226d9185c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-01-29 12:38:22 +03:00 |
|
|
|
a9b16585ea
|
Files: fix delete
|
2021-01-29 10:17:56 +03:00 |
|
|
|
0246a30e84
|
Files: fix creation text file
|
2021-01-27 21:11:47 +03:00 |
|
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +03:00 |
|
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
|
|
1602fff50c
|
Files: fix insert
|
2021-01-25 12:04:25 +03:00 |
|
|
|
036ddc87c3
|
5.0.2
|
2021-01-22 16:49:38 +03:00 |
|
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
|
|
2e85d8a220
|
Files: fix insert
|
2021-01-21 10:42:23 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
|
|
144a86fca7
|
Files: fix Deserialize
|
2021-01-13 13:49:52 +03:00 |
|
|
|
b05a809a32
|
Files: fix API SetAceLink for third-party
|
2021-01-13 11:40:11 +03:00 |
|
|
|
f40b347289
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 19:42:59 +03:00 |
|
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
|
|
43bd3f6541
|
Files: openedit. EncryptionKeys
|
2020-12-29 16:04:50 +03:00 |
|
Vladislav Makhov
|
737605b01e
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
|
2020-12-28 11:34:26 +03:00 |
|
|
|
2fdcbee8ef
|
Files: pass CallbackUrl. Fix trackedit.
|
2020-12-25 23:25:37 +03:00 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
fada5e278b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
|
2020-12-17 13:20:52 +03:00 |
|
Vladislav Makhov
|
b748693676
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Components/src/components/row/index.js
|
2020-12-15 11:00:54 +03:00 |
|
|
|
2548dba9b7
|
Web: Files: Fixed opening file on external link
|
2020-12-10 19:15:36 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
|
|
1675896294
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
|
2020-12-04 11:59:10 +03:00 |
|
Vladislav Makhov
|
af6a1a8c73
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-04 08:16:42 +03:00 |
|
|
|
9ddb7c4d0e
|
Files: fix upload
|
2020-12-03 21:42:39 +03:00 |
|
|
|
ef92cf1cae
|
File: fix FileStreamModel
|
2020-12-03 18:15:35 +03:00 |
|
|
|
d39b0743fd
|
Files: fix GetSecurityInfo
|
2020-12-03 17:50:17 +03:00 |
|
|
|
34f8d17b84
|
Files: set files securityinfo
|
2020-12-03 17:43:33 +03:00 |
|
Vladislav Makhov
|
3064eb302b
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# web/ASC.Web.Common/src/pages/login/index.js
|
2020-12-03 09:59:20 +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 |
|
|
|
228c304211
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-01 12:29:36 +03:00 |
|
|
|
8de24eae99
|
Files: openedit. AllowAnonymous
|
2020-12-01 10:20:15 +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 |
|
Vladislav Makhov
|
813c9c4b1d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-11-30 15:16:49 +03:00 |
|
|
|
40546da35d
|
fix create file
|
2020-11-26 20:30:57 +03:00 |
|
|
|
75fce656f0
|
Merge branch 'develop' into feature/dotnet5
|
2020-11-17 11:31:14 +03:00 |
|
