SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
Diana
|
32241a70a6
|
changed
|
2020-09-07 01:49:03 +03:00 |
|
Diana
|
463a73e22c
|
changed
|
2020-09-06 21:47:52 +03:00 |
|
SuhorukovAnton
|
89318a1f37
|
encryption: fix
|
2020-09-05 23:02:51 +03:00 |
|
Diana
|
9f1cf2f8df
|
changes
|
2020-09-05 22:18:29 +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 |
|
SuhorukovAnton
|
3e3257b4be
|
encryption: fix
|
2020-09-04 11:22: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 |
|
SuhorukovAnton
|
d8576a4b0a
|
encryption: fix
|
2020-09-03 14:48:36 +03:00 |
|
|
5271c7f2f5
|
Api: fix error response
|
2020-09-03 12:38:13 +03:00 |
|
|
aa62721e73
|
EF: refactoring
|
2020-09-02 18:23:39 +03:00 |
|
SuhorukovAnton
|
15b17a0478
|
Encryption: first version
|
2020-09-02 13:54:50 +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 |
|
Diana
|
7466aed406
|
choice between mysql and postgresql
|
2020-08-28 00:45:07 +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 |
|
Diana
|
bb5c2a23e7
|
postgree
|
2020-08-21 05:34:37 +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 |
|
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 |
|
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 |
|
SuhorukovAnton
|
73fff2e63c
|
Merge branch 'master' into feature/scope
|
2020-07-30 16:39:52 +03:00 |
|
SuhorukovAnton
|
456866d4d9
|
scope: refactoring
|
2020-07-30 00:57: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 |
|
SuhorukovAnton
|
830d0d74ec
|
scope: refactoring
|
2020-07-28 17:24:21 +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 |
|
SuhorukovAnton
|
581a5a4751
|
scope: first version
|
2020-07-28 10:35:17 +03:00 |
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +03:00 |
|
Artem Tarasov
|
713b66abd4
|
Merge branch 'master' into feature/Wizard
|
2020-07-23 11:05:57 +03:00 |
|
|
a7ef187616
|
Settings: fix
|
2020-07-22 14:05:27 +03:00 |
|
Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
fafe83cebd
|
Merge branch 'master' into feature/files
|
2020-07-16 16:53:56 +03:00 |
|
|
4681fb0f78
|
fix
|
2020-07-16 16:02:21 +03:00 |
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +03:00 |
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
|
47e597d3b0
|
Autofac: fix
|
2020-07-15 14:18:47 +03:00 |
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
cd3240a7f6
|
Removed LimitedConcurrencyLevelTaskScheduler
|
2020-07-13 14:11:36 +03:00 |
|
|
45678da8e5
|
Merge branch 'master' into feature/files
|
2020-07-10 14:58:37 +03:00 |
|
|
732307a217
|
ResManager: fix
|
2020-07-10 14:57:04 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
|
feba6bb1c0
|
ApiSystem: System.Text.Json
|
2020-07-09 11:08:42 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
|
151ec90f4c
|
Merge branch 'master' into feature/files
|
2020-07-03 11:35:09 +03:00 |
|
|
dc93975a51
|
fixed check confirm method
|
2020-07-02 19:14:03 +03:00 |
|
|
c9a64ca377
|
Added NullIfDefault
|
2020-07-02 18:15:52 +03:00 |
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
|
fee7608370
|
Merge branch 'master' into feature/files
|
2020-06-29 19:16:08 +03:00 |
|
|
314206639f
|
Notify: fix
|
2020-06-29 19:15:18 +03:00 |
|
|
0c18691038
|
Merge branch 'master' into feature/files
|
2020-06-29 18:10:59 +03:00 |
|
|
7950db51ff
|
Notify: fix
|
2020-06-29 18:10:31 +03:00 |
|
|
6c2352d4e5
|
Merge branch 'master' into feature/files
|
2020-06-29 17:54:33 +03:00 |
|
|
b035a6347e
|
Notify: fix
|
2020-06-29 17:49:15 +03:00 |
|
|
77d1853370
|
Merge branch 'master' into feature/files
|
2020-06-29 15:59:37 +03:00 |
|
|
d7cb638a1e
|
Backup: notify fix
|
2020-06-29 15:58:56 +03:00 |
|
|
2d711a9f85
|
Merge branch 'master' into feature/files
|
2020-06-29 15:47:15 +03:00 |
|
|
3f97755c92
|
Backup: fix notify
|
2020-06-29 15:45:38 +03:00 |
|
|
3fd2242766
|
Merge branch 'master' into feature/files
|
2020-06-29 15:15:37 +03:00 |
|
|
4a848ea535
|
Backup: notify fix
|
2020-06-29 15:15:09 +03:00 |
|
SuhorukovAnton
|
e1f7b7365a
|
api-defaultvalue: fix backup
|
2020-06-29 14:40:42 +03:00 |
|
|
6d05a77b60
|
Merge branch 'master' into feature/files
|
2020-06-29 12:40:47 +03:00 |
|
|
eb6be17333
|
Backup: removed notify reference
|
2020-06-29 12:32:43 +03:00 |
|
|
87f85fdefe
|
Merge branch 'master' into feature/files
|
2020-06-29 09:53:07 +03:00 |
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
461fc55f22
|
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
|
2020-06-28 16:23:36 +03:00 |
|
|
155e0b2c9b
|
Backup: fix
|
2020-06-28 14:46:16 +03:00 |
|
|
b617257887
|
Notify: back rename
|
2020-06-28 14:08:12 +03:00 |
|
|
943bd44458
|
Merge branch 'master' into feature/files
|
2020-06-26 12:41:45 +03:00 |
|
|
7cafc968eb
|
Thumb: fix
|
2020-06-26 12:40:46 +03:00 |
|
|
5319b905e6
|
Merge branch 'master' into feature/files
|
2020-06-26 10:54:17 +03:00 |
|
|
237709f8f3
|
Thumb: fix
|
2020-06-26 10:53:52 +03:00 |
|
|
cfdc6d495e
|
Merge branch 'master' into feature/files
|
2020-06-26 09:46:04 +03:00 |
|
|
29a0e752bb
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
# web/ASC.Web.Api/Controllers/PortalController.cs
|
2020-06-25 19:21:42 +03:00 |
|
|
197f468bf7
|
Removed unused proto, added backup rewrite
|
2020-06-25 19:05:14 +03:00 |
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
2fe2c2167b
|
Merge branch 'master' into feature/thumbnails
# Conflicts:
# ASC.Web.sln
|
2020-06-25 15:01:38 +03:00 |
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
SuhorukovAnton
|
cce4d5fa7a
|
Thumbnails: delete unnecessary
|
2020-06-23 14:14:13 +03:00 |
|
SuhorukovAnton
|
4e839c9b11
|
Backup: transfer to ASC.Data.Backup
|
2020-06-23 13:48:36 +03:00 |
|
Ilya Oleshko
|
dacde04f39
|
Merge branch 'master' into feature/files
|
2020-06-23 08:23:07 +03:00 |
|
SuhorukovAnton
|
6f4bd59c6d
|
Thumbnails: refactoring
|
2020-06-21 14:45:31 +03:00 |
|
|
f4592ed73d
|
Thumb: fix
|
2020-06-17 14:36:09 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
|
78593b8c1f
|
UserManager: fix
|
2020-06-17 12:53:12 +03:00 |
|
|
ca9af1080c
|
Backup: refactoring
|
2020-06-17 10:49:17 +03:00 |
|
|
b36dac0cb4
|
Backup: fix
|
2020-06-16 19:04:40 +03:00 |
|
|
b94e4fbeac
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-16 18:00:38 +03:00 |
|
|
b35a60cac0
|
Backup: added DeleteBackupRequest
|
2020-06-16 17:46:10 +03:00 |
|
|
dedd754875
|
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
|
2020-06-16 17:44:56 +03:00 |
|
SuhorukovAnton
|
5fbe80d32a
|
Thumbnails: first version
|
2020-06-16 14:55:46 +03:00 |
|
|
fc0826b60d
|
Backup: service, progress
|
2020-06-16 14:34:44 +03:00 |
|
|
38c40eec05
|
Merge branch 'master' into feature/backup
|
2020-06-15 18:40:26 +03:00 |
|
|
09e7a81e9b
|
UserManager: fix
|
2020-06-15 18:39:52 +03:00 |
|
|
9276bfd384
|
Backup: fix
|
2020-06-15 18:33:53 +03:00 |
|
|
68575e5048
|
Backup: ajaxpro removed
|
2020-06-15 11:19:40 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
8c868252c5
|
Merge branch 'master' into feature/files
|
2020-06-10 11:50:34 +03:00 |
|
|
31fc052531
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:54:35 +03:00 |
|
|
344916b395
|
TenantManager: fix
|
2020-06-09 10:54:05 +03:00 |
|
|
eb7a026025
|
Backup: added autofac
|
2020-06-08 14:57:45 +03:00 |
|
SuhorukovAnton
|
af2295f98a
|
Backup: fix
|
2020-06-08 13:40:26 +03:00 |
|
|
725955e851
|
ProgressQueue: fix
|
2020-06-08 12:44:01 +03:00 |
|
|
5fb753b528
|
Backup: fix start
|
2020-06-08 11:17:54 +03:00 |
|
|
1a5a7dfab5
|
Merge branch 'master' into feature/feed
|
2020-06-05 11:46:12 +03:00 |
|
|
f59be0f44b
|
Merge branch 'master' into feature/backup
|
2020-06-04 17:12:34 +03:00 |
|
|
004dcc2d4d
|
Merge branch 'master' into feature/files
|
2020-06-04 16:48:03 +03:00 |
|
|
fed4d206f7
|
Revert logger
|
2020-06-04 16:46:58 +03:00 |
|
|
d7386049dc
|
Merge branch 'master' into feature/files
|
2020-06-04 16:27:06 +03:00 |
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
172b8bebfc
|
fix
|
2020-06-04 16:13:39 +03:00 |
|
|
ae0fb62add
|
Merge branch 'master' into feature/files
|
2020-06-04 16:05:12 +03:00 |
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
|
b71442fcdc
|
Merge branch 'master' into feature/files
|
2020-06-04 14:02:13 +03:00 |
|
|
1c25d16fc2
|
Products: added absolute path support
|
2020-06-04 14:01:25 +03:00 |
|
|
87af491e89
|
Feed: FilesModule
|
2020-06-04 13:54:13 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
|
84a3c67e1e
|
Merge branch 'master' into feature/feed
|
2020-06-04 11:53:00 +03:00 |
|
Ilya Oleshko
|
99e641bb2f
|
Merge branch 'master' into feature/files
|
2020-06-03 18:53:04 +03:00 |
|
|
81e0917847
|
Files: simplified getHeaders method
|
2020-06-03 18:04:14 +03:00 |
|
|
d6274ea3e0
|
Added Feed.Aggregator
|
2020-06-03 17:53:58 +03:00 |
|
|
d3ebdb2766
|
Feed: rename
|
2020-06-03 13:07:46 +03:00 |
|
SuhorukovAnton
|
89368aed8b
|
Backup: refactoring
|
2020-06-03 12:15:05 +03:00 |
|
|
dbfb84786e
|
Files: simplified getHeaders method
|
2020-06-01 15:16:24 +03:00 |
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
|
4544469dca
|
TenantManager: add TenantHolder
|
2020-06-01 13:55:26 +03:00 |
|
SuhorukovAnton
|
1796c682a4
|
Backup: add backup.json and BackupSettings.cs, fix BackupWorker
|
2020-06-01 13:33:39 +03:00 |
|
|
a81b21bcde
|
Backup: DocumentsBackupStorage
|
2020-06-01 11:52:01 +03:00 |
|
|
0ff1f8249d
|
Backup: refactoring
|
2020-05-29 17:50:39 +03:00 |
|
|
a4146fcce7
|
Backup: refactoring
|
2020-05-29 17:48:27 +03:00 |
|
SuhorukovAnton
|
65739dac46
|
Backup: fix Startup
|
2020-05-28 16:37:36 +03:00 |
|
SuhorukovAnton
|
9655101d2b
|
Backup: add DIHelper's methods and fix startup
|
2020-05-28 16:28:51 +03:00 |
|
SuhorukovAnton
|
e4881214a4
|
Backup: fix SQL
|
2020-05-26 11:52:47 +03:00 |
|
|
b0ae0b5270
|
Merge branch 'master' into feature/files
|
2020-05-22 15:26:05 +03:00 |
|
|
b6817d18b5
|
UrlShortenerService: fix
|
2020-05-22 14:51:03 +03:00 |
|
|
5d5c67ea3c
|
Merge branch 'master' into feature/files
|
2020-05-21 11:51:09 +03:00 |
|
|
3fadf8db6c
|
fix log, added UrlShortenerService config
|
2020-05-21 11:03:35 +03:00 |
|
|
02dd1e9e31
|
Merge branch 'master' into feature/urlshortener
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
|
2020-05-20 18:18:31 +03:00 |
|
SuhorukovAnton
|
6acb0d4208
|
creating
|
2020-05-20 18:14:44 +03:00 |
|
|
1aa1abb768
|
Merge branch 'master' into feature/files
|
2020-05-20 16:07:41 +03:00 |
|
|
85cec8fff2
|
ApiSystem: fix autofac
|
2020-05-20 16:06:35 +03:00 |
|
|
0705756719
|
Merge branch 'master' into feature/files
|
2020-05-19 23:13:51 +03:00 |
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
627dd8a97d
|
ApiSystem: fix
|
2020-05-19 16:22:47 +03:00 |
|
|
b29b11ad0f
|
Merge branch 'master' into feature/apisystem
# Conflicts:
# ASC.Web.sln
|
2020-05-19 14:45:24 +03:00 |
|
|
bb6f32e36a
|
Api: fix
|
2020-05-18 15:08:03 +03:00 |
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
1842076658
|
Merge branch 'master' into feature/files
|
2020-05-18 10:51:37 +03:00 |
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
787ddf831c
|
Merge branch 'master' into feature/files
|
2020-05-15 14:03:33 +03:00 |
|
|
78442cd9eb
|
Files: Service fix
|
2020-05-15 14:02:05 +03:00 |
|
|
ea03b6428f
|
fix
|
2020-05-14 20:39:40 +03:00 |
|
|
c47bcebff3
|
Core: removed Custom Resolver
|
2020-05-14 18:51:22 +03:00 |
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +03:00 |
|
|
8aaf528f2a
|
Elastic: CreateIfNotExist
|
2020-05-14 17:03:24 +03:00 |
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +03:00 |
|
|
74e851e01b
|
ElasticSearch: fixed MatchAll
|
2020-05-08 18:10:53 +03:00 |
|
|
cd70aebb0c
|
Elastic: removed unused classes
|
2020-05-08 17:04:05 +03:00 |
|
|
4160f42d27
|
Files: fixed upload
|
2020-05-07 14:33:12 +03:00 |
|
|
7bf739fe09
|
Optimization
|
2020-05-07 14:02:29 +03:00 |
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
|
7cc06c2322
|
ElasticSearch: state
|
2020-05-06 14:32:26 +03:00 |
|
|
02b33bc07b
|
Merge branch 'master' into feature/files-index
# Conflicts:
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-05-06 11:54:26 +03:00 |
|
|
1526d8e502
|
Common: removed StreamCopyTo
|
2020-05-06 11:41:27 +03:00 |
|
|
f8812bdc05
|
ElasticSearch: reindex
|
2020-05-05 20:40:24 +03:00 |
|
|
af7fb87e73
|
Elastic: settings
|
2020-05-03 18:50:40 +03:00 |
|
|
7ffd2c702f
|
Files: search
|
2020-04-29 19:01:38 +03:00 |
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
bcfbac05c6
|
ElastiSearch: removed Wrapper, WrapperWithDoc
|
2020-04-29 11:04:19 +03:00 |
|
|
adab38548a
|
Files: Index Service
|
2020-04-28 18:11:10 +03:00 |
|
|
b5671cc460
|
Files: Service
|
2020-04-27 19:59:52 +03:00 |
|
|
57f4c3788e
|
ElasticSearch: refactoring. Wrapper replaced with ISearchItem
|
2020-04-27 14:27:58 +03:00 |
|
|
623a6609cc
|
JWT: fix
|
2020-04-24 13:28:06 +03:00 |
|
|
4db07a6010
|
ElasticSearch: updated to 7.6.1
|
2020-04-23 20:24:56 +03:00 |
|
|
4f025d9931
|
Files: fixed download
|
2020-04-23 14:50:34 +03:00 |
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +03:00 |
|
|
7fd2cd206b
|
Api: Update
|
2020-04-20 15:54:13 +03:00 |
|
|
c5ff09ac09
|
Added DI for Voip
|
2020-04-17 17:07:44 +03:00 |
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|