Commit Graph

278 Commits

Author SHA1 Message Date
5633d2467b Merge branch 'master' into feature/files 2020-08-27 10:42:47 +03:00
cff1a01f70 Docker: fix build 2020-08-20 19:04:13 +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
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
281b7a4406 Docker: fix 2020-07-16 14:27:30 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
74b9676819 Docker: added thumbnail, backup, notify 2020-07-07 19:26:55 +03:00
8f9e294d21 docker: bug fix 2020-06-26 12:28:38 +03:00
b3aaa823f5 docker: update sql dump 2020-06-26 11:46:51 +03:00
8afdad8eb4 docker: select branch 2020-06-24 16:51:29 +00:00
be09fc0510 docker: change config/supervisor/supervisord.conf 2020-06-23 19:40:01 +00: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
ea3147af98
Update Dockerfile 2019-12-16 16:06:06 +03:00
fdfaae8abe Docker: .net core up to 3.1 2019-12-09 15:19:18 +03:00
0b1feec7af Docker: added ASC.Web.Common 2019-12-05 12:14:03 +03:00
740942d938 docker: rename repo 2019-11-15 10:45:27 +00:00
f07f71cf59 docker: add libgdiplus package 2019-11-14 14:29:17 +00:00
1f246aac8b docker: add libgdiplus package 2019-11-14 13:32:24 +00:00
f1f313a1bf docker: bug fix 2019-10-11 15:34:49 +00:00
54f3cc778d docker: init commit 2019-10-08 15:00:41 +00:00
57866b8ce3 win: init commit 2019-09-10 18:20:33 +03:00
01e2b38e5c snap: delete obsolete files 2019-09-10 16:45:51 +03:00
3341b343d1 snap package: init 2019-09-04 15:33:02 +00:00
355278cfd1 Requesting administrative privileges for install/uninstall/start/stop 2019-07-11 16:02:33 +03:00
1af2396d38 Start/stop, install/uninstall services via nssm 2019-07-11 13:24:10 +03:00