|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
|
b569245076
|
rever logger
|
2020-06-04 16:47:27 +03:00 |
|
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
|
a14049e88f
|
Settings: fixed GetSupportedCultures
|
2020-06-03 18:51:01 +03:00 |
|
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
|
|
22ae4383b6
|
UrlShortener: fix
|
2020-05-22 13:58:12 +03:00 |
|
|
|
1700ba1965
|
UrlShortener: config
|
2020-05-22 12:41:14 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +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 |
|
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +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 |
|
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +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 |
|
|
|
1dbdb1aedd
|
Files: configuration
|
2020-04-15 18:39:59 +03:00 |
|
|
|
a1e1cd17be
|
FileHandler: fix
|
2020-04-15 13:46:24 +03:00 |
|
|
|
978cf0e34e
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
|
2020-03-19 16:07:16 +03:00 |
|
|
|
d694819eda
|
web: common: bump version
|
2020-03-16 10:49:47 +03:00 |
|
|
|
0ed02f88a0
|
web: components: bump version
|
2020-03-16 10:49:34 +03:00 |
|
|
|
eb21f8a957
|
Update yarn.lock files
|
2020-03-16 10:37:55 +03:00 |
|
|
|
c6d13463ab
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-03-16 10:25:18 +03:00 |
|
dependabot[bot]
|
2f8f43a03a
|
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-03-16 07:22:50 +00:00 |
|
dependabot[bot]
|
e4e7cce565
|
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-03-14 00:55:11 +00:00 |
|
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +03:00 |
|
|
|
ba13637a97
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-03-03 09:37:46 +03:00 |
|
|
|
9a1a118f79
|
Merge branch 'master' into feature/elastic
|
2020-02-27 11:24:14 +03:00 |
|
|
|
97ae3914c5
|
web: common: bump version
|
2020-02-26 16:32:24 +03:00 |
|
|
|
68395a16aa
|
web: components: bump version
|
2020-02-26 16:32:14 +03:00 |
|
|
|
d5a4dbc5be
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-26 16:32:10 +03:00 |
|
|
|
b526b61bdd
|
Update yarn.lock files
|
2020-02-26 13:01:04 +03:00 |
|
|
|
e57e8ff935
|
web: files: Replaced fake product
|
2020-02-26 11:06:44 +03:00 |
|
|
|
1bc8f58df4
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-26 10:55:17 +03:00 |
|
|
|
ac5017da99
|
Merge branch 'master' into feature/elastic
# Conflicts:
# build/build.bat
# build/rebuild.bat
|
2020-02-26 10:46:37 +03:00 |
|
|
|
e4af4d168f
|
Update yarn.lock files
|
2020-02-26 10:23:38 +03:00 |
|
|
|
2ccd226940
|
web: clients: Fixed CRA proxy bug;
|
2020-02-26 10:02:37 +03:00 |
|
|
|
b5bc446cc3
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-25 13:16:02 +03:00 |
|
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
|
9db8b26985
|
Replaced NewtonsoftJson with System.Text.Json
|
2020-02-21 16:19:32 +03:00 |
|
Daniil Senkiv
|
1ae795a86b
|
web: common: bump version
|
2020-02-21 14:14:13 +03:00 |
|
Daniil Senkiv
|
b724548e98
|
web.common: fix working web.client, if api people not available
|
2020-02-21 14:13:45 +03:00 |
|
Daniil Senkiv
|
a1d249be68
|
web.common: fix problem with handling idle modules
|
2020-02-21 14:11:33 +03:00 |
|
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
|
a9f64e474f
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-21 10:20:16 +03:00 |
|
|
|
ed8f6ebc32
|
Web: Components: removed the click close function in the title, fixed tests
|
2020-02-21 10:10:32 +03:00 |
|
