ad534bbc2f
ResManager: fix
2021-04-13 22:49:43 +03:00
3600151c4f
ResManager: fix
2021-04-13 21:19:48 +03:00
560d803d86
Common: added assembly version
2021-04-09 11:12:10 +03:00
50d01a646d
Core: fixed creating group
2021-04-06 21:04:15 +03:00
daa0698645
SocketIO: yarn.lock
2021-04-06 20:36:41 +03:00
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +03:00
a0570554dd
Fixed migrations
2021-03-26 12:26:57 +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
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
Diana
976b955137
fix data in table core_settings
2021-03-17 14:30:25 +03:00
91105e8cd0
EF: removed old column tariff_key
2021-03-17 12:09:49 +03:00
Diana
73731f23b7
fix
2021-03-16 12:53:06 +03:00
Diana
4e62f6a204
update migrations ef tools v.5.0.3
2021-03-09 20:56:57 +03:00
9e4ccb429d
ResManager: fix
2021-03-09 12:04:22 +03:00
05749fcf8e
ResManager: fix
2021-03-08 20:58:55 +03:00
3fff6c0dc8
ResManager: fix
2021-03-07 19:30:36 +03:00
8ebeeffcaf
ResxManager: fix
2021-03-06 11:08:57 +03:00
2b3d534628
ResManager: fix
2021-03-01 11:49:42 +03:00
b223c5006b
ResourceManager: fix
2021-02-28 15:40:50 +03:00
dccbe81002
DataAnnotations: fix
2021-02-25 21:18:27 +03:00
Diana
5c3f2975e8
fix NotMapped
2021-02-25 13:23:26 +03:00
b25dd2d6e2
.net 5
2021-02-25 12:02:28 +03:00
Diana
f1091f409a
fix dataannotations
2021-02-25 12:00:53 +03:00
Diana
4ddd2cebec
delete dataannotations
2021-02-20 22:02:12 +03:00
a0ce9e0dc5
Merge branch 'develop' into feature/not-implemented-page
2021-02-20 11:35:52 +03:00
3274bd0f21
ResManager: fix
2021-02-19 19:17:06 +03:00
Ilya Oleshko
7717784b46
Merge branch 'develop' into feature/not-implemented-page
2021-02-19 16:23:23 +03:00
24d0b0e672
Thridparty: fixed RemoveProvider method
2021-02-19 12:11:04 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
38b62a9a95
FederatedLogin: added EmbeddedResource callback.htm
2021-02-16 19:48:51 +03:00
d7ef3f631b
ResxManager: fix
2021-02-16 13:24:09 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
Artem Tarasov
1ddc2c951a
Merge branch 'develop' into feature/empty-group
...
# Conflicts:
# web/ASC.Web.Common/package.json
2021-02-12 13:10:41 +03:00
a12cf74638
fixed login handler
2021-02-10 22:43:18 +03:00
d05f7b70ec
ResManager: fix
2021-02-09 20:53:49 +03:00
10542fe4b4
ResManager: fix
2021-02-09 17:58:35 +03:00
d823516aa3
fixed profile removed resource
2021-02-03 14:07:18 +03:00
Ilya Oleshko
8226d9185c
Merge branch 'develop' into feature/not-implemented-page
2021-01-29 12:38:22 +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
e11a880956
Core: fix migrations
2021-01-25 15:31:28 +03:00
036ddc87c3
5.0.2
2021-01-22 16:49:38 +03:00
f222f4be0c
.net 5
2021-01-22 16:42:26 +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
2848c39c57
Merge branch 'develop' into feature/thirdparty-integrations
2021-01-14 10:14:46 +03:00
b8e40ff3b2
OAuth: fix links
2021-01-13 16:30:32 +03:00
ae69a9559e
Files: removed temp
2021-01-13 12:41:29 +03:00