TatianaLopaeva
|
a3adea3c27
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-09-15 17:39:34 +03:00 |
|
|
|
7c9df6c3c4
|
Moved from v10.5.2-saas
|
2020-09-11 17:16:59 +03:00 |
|
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
|
|
9282ffbbf1
|
Merge branch 'master' into feature/files
|
2020-09-10 13:40:54 +03:00 |
|
|
|
f89af33b5b
|
fix unhandled exception
|
2020-09-10 13:39:26 +03:00 |
|
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +03:00 |
|
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
|
|
e0febd8890
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-09-09 13:49:25 +03:00 |
|
SuhorukovAnton
|
88646b2d2f
|
default-value-module: fix
|
2020-09-09 13:38:43 +03:00 |
|
SuhorukovAnton
|
3875f9f4b0
|
default-value-module: fix
|
2020-09-09 13:36:53 +03:00 |
|
SuhorukovAnton
|
2378c3746e
|
default-value-module: fix
|
2020-09-09 13:25:50 +03:00 |
|
SuhorukovAnton
|
0f7901628b
|
default-value-module: fix
|
2020-09-09 13:25:13 +03:00 |
|
SuhorukovAnton
|
ce27032fbb
|
default-value-module: first version
|
2020-09-09 12:31:57 +03:00 |
|
|
|
d30026b82f
|
Merge branch 'master' into feature/files
|
2020-09-08 15:20:05 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
|
|
8e3e73c746
|
Scope: fix
|
2020-09-04 13:10:19 +03:00 |
|
|
|
dc98b02d4f
|
fix
|
2020-09-04 12:20:12 +03:00 |
|
|
|
897f3c910e
|
Sln: removed *_Ubuntu configuration
|
2020-09-04 12:06:30 +03:00 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +03:00 |
|
|
|
cbace5e1b4
|
Merge branch 'master' into feature/files
|
2020-09-03 18:32:51 +03:00 |
|
|
|
82dd4a8828
|
Settings: fix timeZones for unix
|
2020-09-03 18:30:14 +03:00 |
|
|
|
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 |
|
SuhorukovAnton
|
32f570784b
|
scope: fix
|
2020-08-31 12:01:23 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
SuhorukovAnton
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +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 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
SuhorukovAnton
|
c96620554d
|
Merge branch 'master' into feature/scope
|
2020-08-24 17:09:42 +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 |
|
