Commit Graph

585 Commits

Author SHA1 Message Date
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
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
5271c7f2f5 Api: fix error response 2020-09-03 12:38:13 +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
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
51ed3a8089 ASC.Resource.Manager.sln 2020-08-20 18:16:41 +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
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
SuhorukovAnton
06e897d982 scope: fix 2020-08-16 17:11:34 +03:00
SuhorukovAnton
eef5c3e4f3 scope: merge fix 2020-08-16 13:11:15 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +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
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
SuhorukovAnton
73fff2e63c Merge branch 'master' into feature/scope 2020-07-30 16:39:52 +03:00