Commit Graph

137 Commits

Author SHA1 Message Date
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
82189388ca fix 2020-01-13 18:50:59 +03:00
b69e86325f Fix 2020-01-13 18:46:28 +03:00
27d03a8cd5 fix 2020-01-13 18:31:49 +03:00
90f5723f48 fix 2020-01-13 18:23:42 +03:00
b1bd5a2b01 fix 2020-01-13 18:18:24 +03:00
ff67ff6f2d fix 2020-01-13 18:12:12 +03:00
6abbe5a81d fix 2020-01-13 18:06:53 +03:00
3e2a78e046 Added telegram step 2020-01-13 18:04:05 +03:00
7c6a9f09a5 Added telegram step 2020-01-13 18:02:17 +03:00
7c080b9804 Jenkins: fixed test 2020-01-13 16:51:06 +03:00
88a2c9637d Jenkinsfile: fix 2020-01-13 16:22:41 +03:00
9173603032 fix 2020-01-13 16:05:16 +03:00
b4342db200 fix 2020-01-13 15:56:11 +03:00
71b8b49ed2 fix 2020-01-13 15:52:40 +03:00
5a4ae07ca8 fix 2020-01-13 15:51:09 +03:00
8c1a49c66c fix 2020-01-13 15:49:49 +03:00
9a6bf07ada fix 2020-01-13 15:44:26 +03:00
d6513a3291 fix 2020-01-13 15:38:44 +03:00
5f150ed505 fix 2020-01-13 15:36:30 +03:00
eac26ebcf7 fix 2020-01-13 15:11:47 +03:00
05003c34b7 Jenkinsfile: added windows build 2020-01-08 16:28:12 +03:00