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
|
a4744ec173
|
Merge branch 'feature/data-storage-migration' of https://github.com/ONLYOFFICE/AppServer into feature/data-storage-migration
|
2020-08-24 10:46:52 +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 |
|
|
|
6b2168e153
|
Merge branch 'master' into feature/data-storage-migration
|
2020-08-23 16:32:21 +03:00 |
|
|
|
fd64100fa7
|
Merge pull request #68 from ONLYOFFICE/feature/socket.io
Feature/socket.io
|
2020-08-21 17:49:34 +03:00 |
|
|
|
3d09efd307
|
fix
|
2020-08-21 17:33:58 +03:00 |
|
|
|
10376475e9
|
Sln: removed *_ubuntu
|
2020-08-21 17:15:13 +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 |
|
|
|
cff1a01f70
|
Docker: fix build
|
2020-08-20 19:04:13 +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 |
|
|
|
f2a50f60e2
|
Settings: fix
|
2020-08-20 12:41:03 +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 |
|
maksim
|
7481b25ad4
|
ASC.Data.Storage.Migration: transferring from the old solution to the new one
|
2020-08-18 16:46:50 +03:00 |
|
|
|
6897cd21ba
|
Merge pull request #66 from ONLYOFFICE/feature/private
Feature/private
|
2020-08-14 18:16:55 +03:00 |
|
|
|
7f9dc150ed
|
Files: revert
|
2020-08-14 18:00:40 +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 |
|
|
|
5e5c50a5f8
|
Merge pull request #69 from ONLYOFFICE/feature/thirdparty
Feature/thirdparty
|
2020-08-14 17:04:00 +03:00 |
|
maksim
|
c7a3fa85f2
|
Thirdparty: remove reference
|
2020-08-14 16:16:48 +03:00 |
|
maksim
|
c24bdfbbba
|
Merge branch 'master' into feature/thirdparty
|
2020-08-14 16:01:55 +03:00 |
|
maksim
|
a1cb820d19
|
Thirdparty: remove files nuget exe
|
2020-08-14 15:53:33 +03:00 |
|
SuhorukovAnton
|
d6eb85c4bc
|
socket: delete waste
|
2020-08-14 14:09:45 +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 |
|
maksim
|
4a29a69761
|
feature custom nuget server
|
2020-08-14 13:48:34 +03:00 |
|
|
|
58fffc1756
|
File: fix revision
|
2020-08-14 11:35:34 +03:00 |
|
|
|
cbf9630d7f
|
File: added Locked, LockedBy
|
2020-08-13 11:52:59 +03:00 |
|
|
|
6782269c7f
|
Files: lock file
|
2020-08-12 18:13:52 +03:00 |
|
|
|
3a37e0839a
|
Files: fix FileShareLink
|
2020-08-12 17:34:54 +03:00 |
|
|
|
acf5cff2f9
|
Merge pull request #67 from ONLYOFFICE/feature/Wizard
Feature/wizard
|
2020-08-12 17:33:18 +03:00 |
|
Artem Tarasov
|
1bd341fc33
|
fix translate
|
2020-08-12 17:17:14 +03:00 |
|
Artem Tarasov
|
c6d1198ae0
|
deleted console.log, simple condition
|
2020-08-12 16:38:34 +03:00 |
|
Artem Tarasov
|
4499d82de9
|
decomposition
|
2020-08-12 16:32:42 +03:00 |
|
Artem Tarasov
|
c301178a16
|
fixed translate
|
2020-08-12 16:32:17 +03:00 |
|
Artem Tarasov
|
171ae1b147
|
web: common: bump version
|
2020-08-12 14:57:41 +03:00 |
|
Artem Tarasov
|
00fcc549e5
|
web: components: bump version
|
2020-08-12 14:57:24 +03:00 |
|
Artem Tarasov
|
2bd6c8eb10
|
Merge branch 'master' into feature/Wizard
|
2020-08-12 14:56:22 +03:00 |
|
Artem Tarasov
|
f110b2a49a
|
deleted Toast, added ModalDialog
|
2020-08-12 14:18:40 +03:00 |
|
SuhorukovAnton
|
6a005af895
|
private: bugfix
|
2020-08-12 14:11:41 +03:00 |
|
maksim
|
6782b16413
|
fix: replacing projectreference with packagereference
|
2020-08-12 13:34:19 +03:00 |
|
Artem Tarasov
|
e3119d4610
|
fixed fontWeight link for License
|
2020-08-12 13:30:24 +03:00 |
|
Artem Tarasov
|
034d60707d
|
fixed link
|
2020-08-12 13:08:24 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
