|
|
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 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +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 |
|
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 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c9a64ca377
|
Added NullIfDefault
|
2020-07-02 18:15:52 +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 |
|
|
|
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 |
|
|
|
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 |
|
