Commit Graph

102 Commits

Author SHA1 Message Date
Adam Zheng 833f74430f
Merge pull request #30 from Venator-Fox/development
Development
2017-11-07 17:48:37 -06:00
Adam Zheng 20195b84e8
Merge pull request #29 from Venator-Fox/feature/documentation
Fix error in example compose file
2017-11-07 17:48:08 -06:00
Adam W Zheng b30764b37b Fix error in example compose file 2017-11-07 17:46:32 -06:00
Adam Zheng b714b40f52
Merge pull request #28 from Venator-Fox/feature/documentation
Clarify location of sample files
2017-11-07 17:37:50 -06:00
Adam Zheng 33c9d3c829
Clarify location of sample files 2017-11-07 17:37:28 -06:00
Adam Zheng f5f4eb1101
Merge pull request #27 from Venator-Fox/feature/upgrade-1.14.17
Feature/upgrade 1.14.17
2017-11-07 17:12:00 -06:00
Adam Zheng 10b55f5fcd
Correct typo in 1.14.17 update 2017-11-07 17:08:57 -06:00
Adam W Zheng f5f0c41ad9 Upgrade to 1.14.17 2017-11-07 16:06:34 -06:00
Adam Zheng cff221722c Merge pull request #26 from Venator-Fox/development
Reapply changes lost in merge error
2017-09-08 11:14:43 -05:00
Adam Zheng 77e04a22ed Reapply changes lost in merge error 2017-09-08 11:14:17 -05:00
Adam Zheng 8761656f85 Merge pull request #25 from Venator-Fox/development
Development
2017-09-08 11:10:30 -05:00
Adam Zheng cf9d5796af Merge pull request #24 from Venator-Fox/hotfix/ldap-conf-tls-reqcert-syntax
Hotfix/ldap conf tls reqcert syntax
2017-09-08 11:10:01 -05:00
Adam Zheng b741b6ab29 Merge pull request #23 from Venator-Fox/hotfix/ldap-conf-tls-reqcert-syntax
Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value
2017-09-08 11:09:23 -05:00
Adam W Zheng c0ddbf0d42 Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value 2017-09-08 11:06:48 -05:00
Adam Zheng 02c6c93144 Merge pull request #22 from Venator-Fox/revert-21-hotfix/ldap-conf-tls-reqcert-syntax
Revert "Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value"
2017-09-08 11:04:18 -05:00
Adam Zheng 44f74c3341 Revert "Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value" 2017-09-08 11:03:38 -05:00
Adam Zheng 9a80389c84 Merge pull request #21 from Venator-Fox/hotfix/ldap-conf-tls-reqcert-syntax
Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value
2017-09-08 11:02:07 -05:00
Adam Zheng b4d9c04f13 Merge pull request #20 from Venator-Fox/development
Development
2017-09-08 11:01:43 -05:00
Adam Zheng af47a176e5 Merge pull request #19 from Venator-Fox/feature/documentation
Fix description in CONFIG_BASEURLPATH
2017-09-08 11:01:02 -05:00
Adam W Zheng ff6b7a7510 Fix description in CONFIG_BASEURLPATH 2017-09-08 10:57:52 -05:00
Adam W Zheng b55880a0f9 Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value 2017-09-08 10:51:43 -05:00
Adam Zheng 2ad295a1e7 Merge pull request #18 from Venator-Fox/development
Development
2017-09-07 14:14:55 -05:00
Adam Zheng d859e1e484 Merge pull request #17 from Venator-Fox/feature/documentation
Feature/documentation
2017-09-07 14:13:39 -05:00
Adam Zheng 19e8d76510 Merge pull request #15 from Venator-Fox/feature/add-baseurlpath-configuration
Add CONFIG_BASEURLPATH environment variable
2017-09-07 14:12:54 -05:00
Adam W Zheng f799f9153a Update documentation and examples for CONFIG_BASEURLPATH environment variable 2017-09-07 14:08:33 -05:00
Adam W Zheng 17cd187344 Add CONFIG_BASEURLPATH environment variable 2017-09-07 13:53:18 -05:00
Adam W Zheng 471fa9156c Add a CR between Shields and start of document 2017-09-07 12:28:01 -05:00
Adam Zheng 87be654e86 Merge pull request #14 from Venator-Fox/development
Merge pull request #13 from Venator-Fox/hotfix/phpfpm-pid
2017-09-07 11:38:02 -05:00
Adam Zheng bdac949275 Merge pull request #13 from Venator-Fox/hotfix/phpfpm-pid
Resolve php-fpm startup issues when host is CentOS
2017-09-07 11:36:43 -05:00
Adam Zheng 2c96b6ad90 Merge pull request #12 from Venator-Fox/hotfix/phpfpm-pid
Resolve php-fpm startup issues when host is CentOS
2017-09-07 11:36:06 -05:00
Adam W Zheng fd98e72957 Resolve php-fpm startup issues when host is CentOS 2017-09-07 11:33:53 -05:00
Adam Zheng 364af9fec1 Merge pull request #11 from Venator-Fox/development
Development
2017-09-07 10:02:32 -05:00
Adam Zheng 7ab96a13f6 Merge pull request #10 from Venator-Fox/feature/upgrade-1.14.16
Feature/upgrade 1.14.16
2017-09-07 10:01:39 -05:00
Adam W Zheng 7079a5f062 Update documentation for 1.14.16 2017-09-07 10:00:04 -05:00
Adam W Zheng c4cf8722f0 Update documentation for 1.14.16 2017-09-07 09:56:56 -05:00
Adam Zheng ad9e834da2 Merge pull request #9 from Venator-Fox/development
Development
2017-09-07 09:46:52 -05:00
Adam Zheng 939689ed4d Merge branch 'master' into development 2017-09-07 09:46:35 -05:00
Adam Zheng e0b4e3d4a5 Merge pull request #8 from Venator-Fox/feature/upgrade-1.14.16
Feature/upgrade 1.14.16
2017-09-07 09:45:21 -05:00
Adam Zheng 608095b0fd Reapply changes lost from Merge pull request #7 from Venator-Fox/hotfix/loggingdir-ownership 2017-09-07 09:43:54 -05:00
Adam W Zheng a0754bf6c0 Upgrade to 1.14.16 2017-09-07 09:37:16 -05:00
Adam Zheng d97f88462b Merge pull request #7 from Venator-Fox/hotfix/loggingdir-ownership
Correct loggindir ownership from nginx to php-fpm
2017-09-06 17:06:03 -05:00
Adam Zheng f047594b1a Merge pull request #6 from Venator-Fox/development
Development
2017-09-06 17:05:46 -05:00
Adam Zheng 32aa06623b Merge pull request #5 from Venator-Fox/feature/documentation
Feature/documentation
2017-09-06 17:04:27 -05:00
Adam W Zheng 998aa0e915 Correct loggindir ownership from nginx to php-fpm 2017-09-06 17:01:47 -05:00
Adam W Zheng 82756c2130 Add port to example docker run 2017-09-06 16:51:23 -05:00
Adam Zheng 0bcf138b91 Merge pull request #4 from Venator-Fox/development
Development
2017-09-06 16:21:38 -05:00
Adam Zheng 6849417354 Merge pull request #3 from Venator-Fox/feature/documentation
Feature/documentation
2017-09-06 16:21:08 -05:00
Adam W Zheng 94b014c970 Add Shields to Git README.md 2017-09-06 16:08:12 -05:00
Adam W Zheng 1b0a40404f Add Shields to Docker README.md 2017-09-06 16:07:12 -05:00
Adam W Zheng 5965729cea Fix typo phpsession 2017-09-06 15:54:27 -05:00