Commit Graph

79 Commits

Author SHA1 Message Date
root
8d61d23972 Merge remote-tracking branch 'origin/master' into 3.0 2018-05-31 20:10:20 -07:00
root
a01674e016 Fixed '[' character escaping 2018-05-31 20:06:05 -07:00
root
b7439bd28d Updated all Dockerfiles to make consistency 2018-05-31 02:20:14 -07:00
root
53ff586760 Updated all Dockerfiles to make consistency 2018-05-31 00:50:32 -07:00
Alexey Pustovalov
b2c3ed6705
Merge pull request #301 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:22:13 +03:00
root
278be78a91 Fixed php-fpm7 on Alpine images 2018-05-11 13:00:31 -07:00
root
5cec9cca9b Zabbix 3.0.17 2018-05-10 17:02:20 -07:00
root
f8675ee603 Zabbix v3.0.16 2018-04-06 07:55:54 -07:00
Alexey Pustovalov
a7a45ad4ee
Merge pull request #267 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:05:52 +03:00
root
f4aa02c0b9 Fixed small issues. Preparation for Appliance 2018-03-30 06:15:14 -07:00
Alexey Pustovalov
b6821475c1
Merge pull request #262 from zabbix/master
Master
2018-03-30 16:36:06 +03:00
root
2f8752ac1c Fixed small issues. Preparation for Appliance 2018-03-30 01:36:04 -07:00
root
fb6866403c Fixed small issues. Preparation for Appliance 2018-03-29 07:21:02 -07:00
Alexey Pustovalov
9665660e09
Merge pull request #257 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:53:24 +03:00
root
6e7a247564 Fixed small issues. Preparation for Appliance 2018-03-29 06:28:10 -07:00
root
17a29083cf Zabbix 3.0.15 release 2018-02-26 02:37:43 -08:00
root
cd2a3a0627 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-23 13:48:40 -08:00
root
de98c6bbd8 Escpaing special characters 2018-02-23 13:43:00 -08:00
root
428e64e7e9 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 14:37:22 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
Alexey Pustovalov
f1800bb057
Merge pull request #238 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:09:45 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
b0b2e073ec
Merge pull request #229 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:01:40 +02:00
root
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
root
1be4813733 Revert "Merge branch '3.4' into master"
This reverts commit e3dd845396, reversing
changes made to 461f869a4a.
2018-02-17 16:12:34 -08:00
Alexey Pustovalov
ff2e320cee
Merge pull request #198 from zabbix/master
Master
2018-02-18 23:08:00 +02:00
Alexey Pustovalov
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00
Alexey Pustovalov
67d50cacb3 The big one update :-) 2018-02-18 22:42:44 +02:00
root
93d3ff421a Updated Zabbix logo 2018-02-17 10:51:12 -08:00
root
8f39e80b6f Revert "Merge branch 'trunk' into master"
This reverts commit 78b62d9ce5, reversing
changes made to f4e4c3f70f.
2018-02-17 10:38:49 -08:00
Alexey Pustovalov
78b62d9ce5
Merge branch 'trunk' into master 2018-02-19 00:59:05 +02:00
root
f4e4c3f70f Revert "Merge branch '3.4' into master"
This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
2018-02-17 10:22:18 -08:00
Alexey Pustovalov
49a0e5deb7
Merge branch '3.4' into master 2018-02-19 00:10:51 +02:00
root
e212ec751b Zabbix 3.4.6 release 2018-01-16 20:04:34 +02:00
root
2948c37084 Zabbix 3.0.14 release 2018-01-04 21:21:25 +02:00
root
5160cf3c02 Zabbix 3.4.5 release 2018-01-04 21:20:26 +02:00
root
19dc7d69e7 Zabbix 3.4.4 release 2017-11-09 15:43:26 +02:00
root
b2ca042eee Zabbix 3.0.13 release 2017-11-09 15:40:17 +02:00
root
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
Alexey Pustovalov
4fb4158517
Merge pull request #166 from zabbix/master
Fixed MySQL user creation
2017-10-27 18:54:20 +03:00
root
3bbbdeff92 Fixed MySQL user creation 2017-10-27 18:53:31 +03:00
root
4f481f811e Fixed MySQL user creation 2017-10-27 18:51:39 +03:00
root
3b989be95f Zabbix 3.4.3 release 2017-10-21 17:34:03 +03:00
root
0f943d01f5 Zabbix 3.0.12 release 2017-10-21 17:31:55 +03:00
root
a2ab1a9bfd Zabbix 3.4.2 release 2017-10-12 20:33:53 +03:00
root
3e03235c40 Zabbix 3.4.1 release 2017-08-31 10:48:49 +03:00
dotneft
a206680ea3 Zabbix 3.4.0 release 2017-08-22 02:42:14 -07:00
Alexey Pustovalov
95b65f1aee Merge pull request #128 from zabbix/master
Zabbix 3.4 release
2017-08-22 12:25:50 +03:00
Alexey Pustovalov
09a338f782 Merge pull request #126 from zabbix/master
Zabbix 3.4 release
2017-08-22 12:24:51 +03:00
dotneft
6c7849cdd3 Zabbix 3.4 release 2017-08-22 02:23:19 -07:00