|
db97b65727
|
Merge branch 'master' into feature/files
|
2020-09-03 17:40:26 +03:00 |
|
|
5271c7f2f5
|
Api: fix error response
|
2020-09-03 12:38:13 +03:00 |
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
a48f8fb43e
|
Migration: fix start
|
2020-08-28 18:30:26 +03:00 |
|
maksim
|
c07be0324a
|
ASC.Data.Storage.Migration: fix
|
2020-08-28 14:58:20 +03:00 |
|
maksim
|
aa78badaec
|
ServiceClientListener: fix cache
|
2020-08-28 14:26:06 +03:00 |
|
maksim
|
e4b2c45ee6
|
MigrateServiceClient: adding a cache
|
2020-08-28 13:23:09 +03:00 |
|
maksim
|
138348f668
|
MigrateServiceClient: fix
|
2020-08-28 11:31:46 +03:00 |
|
maksim
|
95299daaf9
|
ASC.Data.Storage.Migration: adding listener and extension
|
2020-08-27 17:06:03 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
5633d2467b
|
Merge branch 'master' into feature/files
|
2020-08-27 10:42:47 +03:00 |
|
|
952e0f40c7
|
Settings: authservice api
|
2020-08-26 17:34:21 +03:00 |
|
maksim
|
75eabe38a0
|
MigrateServiceClient: fix
|
2020-08-26 10:07:12 +03:00 |
|
maksim
|
1e97a26847
|
MigrationService: changing subscription
|
2020-08-25 10:48:18 +03:00 |
|
maksim
|
6cfd945b3e
|
ASC.Data.Storage.Migration: fix
|
2020-08-24 11:04:43 +03:00 |
|
maksim
|
eb58c24d2e
|
LaunchSettings: fix
|
2020-08-24 10:45:51 +03:00 |
|
maksim
|
eecf23f214
|
ASC.Data.Storage.Migration: bugfix
|
2020-08-24 09:52:17 +03:00 |
|
|
3d09efd307
|
fix
|
2020-08-21 17:33:58 +03:00 |
|
|
b06a4b4991
|
Merge branch 'master' into feature/socket.io
# Conflicts:
# ASC.Web.sln
# thirdparty.sln
# thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
|
2020-08-21 15:25:07 +03:00 |
|
maksim
|
280604e41d
|
ASC.Data.Storage.Migration: adding protocol buffers and event listening
|
2020-08-21 11:05:27 +03:00 |
|
|
af9166d5ec
|
Merge branch 'master' into feature/files
|
2020-08-20 18:20:42 +03:00 |
|
|
51ed3a8089
|
ASC.Resource.Manager.sln
|
2020-08-20 18:16:41 +03:00 |
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
maksim
|
326d352a7c
|
Migration: registering dependencies in program
|
2020-08-20 16:53:39 +03:00 |
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# 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
|
2020-08-20 12:43:12 +03:00 |
|
|
1415d7e881
|
WebSocketSharp to nuget
|
2020-08-20 12:38:57 +03:00 |
|
|
f837b3aa24
|
Merge branch 'master' into feature/socket.io
# Conflicts:
# ASC.Web.sln
|
2020-08-19 19:53:13 +03:00 |
|
maksim
|
b6b2490442
|
ASC.Data.Storage.Migration: changes to the folder location
|
2020-08-18 16:49:28 +03:00 |
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
SuhorukovAnton
|
4db1cd0af8
|
Merge branch 'master' into feature/socket.io
|
2020-08-14 14:01:27 +03:00 |
|
SuhorukovAnton
|
645b07b511
|
socket: bagfix
|
2020-08-14 13:56:15 +03:00 |
|
Ilya Oleshko
|
37fe1cab21
|
Merge branch 'master' into feature/files
|
2020-08-12 18:05:29 +03:00 |
|
SuhorukovAnton
|
6a005af895
|
private: bugfix
|
2020-08-12 14:11:41 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
98b69d6492
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'last_modified' at row 1
|
2020-08-10 20:17:00 +03:00 |
|
|
e860d1ab76
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'create_on'
|
2020-08-10 20:16:34 +03:00 |
|
SuhorukovAnton
|
601b063ce8
|
socket.io: add websocket-sharp
|
2020-08-08 22:40:40 +03:00 |
|
|
518648cb19
|
Fix parse license
|
2020-08-04 17:29:43 +03:00 |
|
|
39b984debd
|
Settings: added license/required and license upload
|
2020-08-03 16:42:59 +03:00 |
|
SuhorukovAnton
|
b5ff2b9feb
|
socket.io: fix
|
2020-08-03 11:20:57 +03:00 |
|
SuhorukovAnton
|
3d8d378a90
|
socket.io: first version
|
2020-08-02 23:12:45 +03:00 |
|
|
72ae1f5e9b
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-31 16:49:54 +03:00 |
|
Ilya Oleshko
|
fa8a0b92d8
|
Merge branch 'master' into feature/files
|
2020-07-31 15:05:58 +03:00 |
|
Ilya Oleshko
|
77b9836f63
|
Merge branch 'master' into feature/new-login-page
|
2020-07-29 13:50:03 +03:00 |
|
Artem Tarasov
|
4c9a7dadfd
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-29 11:52:18 +03:00 |
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +03:00 |
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +03:00 |
|