|
|
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 |
|
|
|
cff1a01f70
|
Docker: fix build
|
2020-08-20 19:04:13 +03:00 |
|
SuhorukovAnton
|
4db1cd0af8
|
Merge branch 'master' into feature/socket.io
|
2020-08-14 14:01:27 +03:00 |
|
SuhorukovAnton
|
112a378d28
|
socket: add bat
|
2020-08-09 11:34:09 +03:00 |
|
SuhorukovAnton
|
b5ff2b9feb
|
socket.io: fix
|
2020-08-03 11:20:57 +03:00 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
|
156f7cb534
|
Docker: fix files.
|
2020-07-28 14:21:41 +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 |
|
|
|
281b7a4406
|
Docker: fix
|
2020-07-16 14:27:30 +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 |
|
Artem Tarasov
|
0e2da28101
|
added getPortalSettings after wizard completed
|
2020-07-10 19:00:21 +03:00 |
|
|
|
74b9676819
|
Docker: added thumbnail, backup, notify
|
2020-07-07 19:26:55 +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 |
|
|
|
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 |
|
|
|
453c812476
|
docker update
|
2020-06-23 18:10:13 +00:00 |
|
|
|
11cf2a954f
|
docker: mysql sample data
|
2020-06-23 19:55:14 +03:00 |
|
|
|
62e179fae0
|
update dockerfile
|
2020-06-23 15:31:48 +00:00 |
|
SuhorukovAnton
|
6f4bd59c6d
|
Thumbnails: refactoring
|
2020-06-21 14:45:31 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
|
|
fc0826b60d
|
Backup: service, progress
|
2020-06-16 14:34:44 +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 |
|
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
|
90d93db14c
|
FileService: bat and launchSettings
|
2020-05-08 11:35:04 +03:00 |
|
|
|
8bbe383e78
|
Added url shortener service install scripts
|
2020-03-05 14:56:07 +03:00 |
|
|
|
ac5017da99
|
Merge branch 'master' into feature/elastic
# Conflicts:
# build/build.bat
# build/rebuild.bat
|
2020-02-26 10:46:37 +03:00 |
|
|
|
2ccd226940
|
web: clients: Fixed CRA proxy bug;
|
2020-02-26 10:02:37 +03:00 |
|
|
|
af40cd8ca7
|
web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined
|
2020-02-25 11:56:41 +03:00 |
|
|
|
4ca24f0077
|
Files: Init Files.Client
|
2020-02-25 09:58:09 +03:00 |
|
|
|
00246f7f9f
|
Files: Startup
|
2020-02-12 13:48:58 +03:00 |
|
|
|
e33caf13dd
|
Jenkinsfile: chat_id to credentials
|
2020-01-15 13:35:21 +03:00 |
|
|
|
f3da100abe
|
fixed message
|
2020-01-15 12:13:42 +03:00 |
|
|
|
39ceff556a
|
Jenkins: fixed telegram message
|
2020-01-15 11:47:33 +03:00 |
|
|
|
d298e09b0b
|
Removed publishCoverageGithub
|
2020-01-14 23:13:42 +03:00 |
|
|
|
abd5e307be
|
fix
|
2020-01-14 22:21:49 +03:00 |
|
|
|
8332ba4502
|
Revert "fix"
This reverts commit af425365f4.
|
2020-01-14 21:38:25 +03:00 |
|
|
|
af425365f4
|
fix
|
2020-01-14 18:57:04 +03:00 |
|
|
|
184a7febf2
|
Jenkinsfile: fix
|
2020-01-14 18:40:32 +03:00 |
|
|
|
13c3bbc780
|
fix
|
2020-01-14 18:15:52 +03:00 |
|
|
|
fbb75572f9
|
Jenkinsfile: added when
|
2020-01-14 18:10:07 +03:00 |
|
|
|
4330c3b4c3
|
JenkinsFile: publishCoverageGithub and telegram message
|
2020-01-14 17:44:56 +03:00 |
|
|
|
c3d38416a2
|
fix message
|
2020-01-14 16:54:22 +03:00 |
|
|
|
cee6b77cbd
|
Jenkinsfile: fix
|
2020-01-14 16:34:21 +03:00 |
|
|
|
2cb0e94b6b
|
Jenkins: telegram to end
|
2020-01-14 16:07:05 +03:00 |
|
|
|
6f91f1bbf6
|
Jenkisfile: publishCoverage
|
2020-01-14 15:28:14 +03:00 |
|
|
|
cc6eb2a4fb
|
fix
|
2020-01-14 14:06:56 +03:00 |
|
|
|
059989ba90
|
Jenkinsfile: fix cobertura
|
2020-01-14 13:54:46 +03:00 |
|
|
|
38451fd460
|
Jenkinsfile: temp echo.Added cobertura
|
2020-01-14 13:41:38 +03:00 |
|
|
|
c040b1718e
|
Jenkinsfile: test
|
2020-01-14 12:05:28 +03:00 |
|
|
|
58f001f2a3
|
Jenkinsfile: telegram token to credentials, skipdefaultcheckout
|
2020-01-14 11:44:48 +03:00 |
|
