|
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 |
|
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 |
|