Commit Graph

777 Commits

Author SHA1 Message Date
885ca1491b
Create docker-image.yml 2020-11-23 20:03:55 +03:00
ae468abc5c atlassian updates 2020-11-23 19:12:51 +03:00
a735f67bc9 atlassian 2020-11-06 18:35:32 +03:00
a57d6c752d Merge branch 'develop' into master 2020-10-29 17:51:06 +03:00
f265ed7cb1 updatess 2020-10-29 17:51:00 +03:00
652149ac3d Merge remote-tracking branch 'origin/develop' into master 2020-10-05 17:58:37 +03:00
1b61d7ee02 atlassian 2020-10-05 17:58:04 +03:00
07ebdf7060 Merge remote-tracking branch 'origin/develop' into master 2020-10-03 21:03:04 +03:00
14ff56929e firx 2020-10-03 21:02:39 +03:00
218c364b50 vk2discord 2020-10-03 21:02:17 +03:00
4a5bd75f9a Merge remote-tracking branch 'origin/develop' into master 2020-10-01 02:20:54 +03:00
14b2bb8434 jira 8.12.2 2020-10-01 02:20:20 +03:00
5ad6d36ff4 jira 8.12.2 2020-10-01 02:19:46 +03:00
5c32175127 nginx 1.19.3 2020-10-01 02:19:08 +03:00
c9a46267e7
Merge pull request #52 from EpicMorg/dependabot/add-v2-config-file
Create Dependabot config file
2020-09-18 19:59:35 +03:00
dependabot-preview[bot]
2475a5fdce
Create Dependabot config file 2020-09-18 16:58:55 +00:00
b614708b3a Merge branch 'develop' into master 2020-09-11 01:55:35 +03:00
776c986df9 zabbix proxy 2020-09-11 01:55:15 +03:00
59aacdc0ac Merge branch 'develop' into master 2020-09-11 00:53:35 +03:00
cde13c7dec jira 2020-09-11 00:53:06 +03:00
19397f52bf Merge branch 'develop' into master 2020-09-04 20:02:52 +03:00
1d0d1c12a3 travis fix 2020-09-04 20:02:28 +03:00
876a8514d1
Merge pull request #51 from EpicMorg/develop
Develop
2020-09-04 19:38:15 +03:00
8c3e077eae upgrades and fixes 2020-09-04 19:37:25 +03:00
b3dc4842c1 fixes 2020-09-04 19:01:04 +03:00
bdc88f3bf3 fixes 2020-09-04 19:00:05 +03:00
f8b19fc0d2 testrail fix 2020-09-04 17:30:13 +03:00
881cd813fb php74 fix 2020-09-04 17:29:49 +03:00
6aca8c21ab bullseye 2020-09-04 17:20:28 +03:00
50e9110bb0 zabbix bionic->focal fix 2020-09-04 17:05:07 +03:00
cc42730df8 ldap fix balancer + nginx 1.19.2 2020-09-04 17:00:15 +03:00
d26ede6bb0 ldap fix websites 2020-09-04 16:57:42 +03:00
7dc324578d BROKEN 2020-08-17 15:33:50 +03:00
9fe149953e Merge branch 'develop' 2020-08-04 20:34:22 +03:00
889f6e9d67 epicmorg/balancer:rtmp-hls 2020-08-04 20:33:58 +03:00
7cffa9e877 Merge branch 'develop' 2020-08-04 18:09:14 +03:00
652c00fa4d epicmorg/balancer:rtmp-hls 2020-08-04 18:07:54 +03:00
18a4ba843f Merge branch 'develop' 2020-08-04 17:36:00 +03:00
759b6eeb8a epicmorg/balancer:rtmp-hls 2020-08-04 17:35:44 +03:00
6279566d4b Merge branch 'develop' 2020-08-04 17:33:36 +03:00
bd9af5c7cc epicmorg/balancer:rtmp-hls 2020-08-04 17:33:16 +03:00
092e7439f4
Update README.md 2020-08-04 16:41:37 +03:00
8ac58973be nginx updates 2020-08-04 16:02:37 +03:00
f03ed1d5ef Merge branch 'develop' 2020-07-30 18:20:06 +03:00
aaa7ef7b20 Websites (php 7.4) 2020-07-30 18:18:19 +03:00
68ffd6acd0 Testrail Production image (php 7.2) 2020-07-30 18:13:45 +03:00
ee2d1cd8eb Testrail Production image (php 7.2) 2020-07-30 17:52:12 +03:00
05ff38fa89
Merge pull request #50 from EpicMorg/develop
jul-patch
2020-07-18 04:39:10 +03:00
9fb1e78f18 nginx 2020-07-18 00:59:00 +03:00
8779139b2e updates 2020-07-17 18:14:45 +03:00