ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 69c180d2e8 use CREATE USER to define account authentication characteristics spuch 2017-03-20 15:01:16 +0800
  • 134911843a Merge branch 'master' into MSSQL_SUPPORT Ignacio Cabrera 2017-03-18 19:11:01 -0300
  • d31ccbd268 Conflict resolved docker-compose file ZeroC0D3 Team 2017-03-18 08:29:14 +0700
  • 2bbe39cf4a Merge branch 'master' into master ZeroC0D3 Team 2017-03-18 07:52:45 +0700
  • 4588685e97 Updated project example confs to fit nameing convention used in apache example Marius van Zundert 2017-03-17 19:34:32 +0100
  • 4b2ddfad20 Updated project example confs to not have gitignore issues Marius van Zundert 2017-03-17 19:32:45 +0100
  • 516b148dae Merge branch 'master' of github.com:laradock/laradock Marius van Zundert 2017-03-17 16:56:14 +0100
  • 0c53eadf34 docker-71 file now also works with new env-example setup Marius van Zundert 2017-03-17 16:55:53 +0100
  • 3e61554625 Merge pull request #687 from jefhar/jefhar-patch-1 v5.0.2 Mahmoud Zalt 2017-03-17 11:09:45 -0400
  • 6054c2d250 Merge pull request #686 from cjmaxik/patch-3 Mahmoud Zalt 2017-03-17 11:08:29 -0400
  • 5589a12b9d Merge pull request #691 from davidtaboas/patch-1 Mahmoud Zalt 2017-03-17 11:07:36 -0400
  • e2384e2722 Merge pull request #689 from picospuch/patch-1 Mahmoud Zalt 2017-03-17 11:07:21 -0400
  • d077085595 Merge pull request #688 from Mvzundert/master Mahmoud Zalt 2017-03-17 11:07:06 -0400
  • 53f1032975 Merge pull request #673 from cabrerabywaters/PHP_WORKER Mahmoud Zalt 2017-03-17 11:05:53 -0400
  • 875ec23ade Merge pull request #661 from g9308370/add_apache_vhost_conf Mahmoud Zalt 2017-03-17 11:01:10 -0400
  • cee9de7ed1 Fix Dockerfile-70 David Táboas 2017-03-17 10:10:32 +0100
  • badad156e1 Merge branch 'master' into add_apache_vhost_conf g9308370 2017-03-17 16:37:59 +0800
  • 8e89725381 Update env-example picospuch 2017-03-17 16:37:42 +0800
  • 2219177eac Merge branch 'master' into master ZeroC0D3 Team 2017-03-17 14:54:06 +0700
  • baf29b1223 re-added .gitignore for nginx dir, still do not want configs in git Marius van Zundert 2017-03-17 08:48:47 +0100
  • 5c0933d19a Merge with master branch ZeroC0D3 Team 2017-03-17 14:36:00 +0700
  • 8de9eca8ae Fixing the docker-compose.yml ZeroC0D3 Team 2017-03-17 13:57:54 +0700
  • d172180660 Add constant PHP_FPM_INSTALL_INTL=false & APPLICATION ZeroC0D3 Team 2017-03-17 13:53:04 +0700
  • 9f78b17fd1 Fixing indent_size=2 from 4 ZeroC0D3 Team 2017-03-17 13:52:19 +0700
  • f5e33fb396 Update .gitignore file ZeroC0D3 Team 2017-03-17 13:49:21 +0700
  • 9ae6e45dda Merge branch 'master' of https://github.com/Laradock/laradock Mahmoud Zalt 2017-03-17 02:46:35 -0400
  • 94d88e91c5 add missing steps to the docs Mahmoud Zalt 2017-03-17 02:46:19 -0400
  • 8b4901ce57 Closed if jefhar 2017-03-16 23:28:29 -0700
  • 08086be4c5 PHP_FPM_INSTALL_INTL env-example jefhar 2017-03-16 23:26:54 -0700
  • f2805bca52 Update docker-compose.yml Ignacio Cabrera 2017-03-16 22:21:26 -0300
  • 033e1b8721 Merge branch 'master' into PHP_WORKER Ignacio Cabrera 2017-03-16 21:59:28 -0300
  • 9e290ffddb Merge pull request #680 from cjmaxik/feature-intl Mahmoud Zalt 2017-03-16 20:57:47 -0400
  • 6ada2f1b91 nginx samples sites for multiple projects v5.0.1 Mahmoud Zalt 2017-03-16 20:53:14 -0400
  • c6e393f5ce Update Dockerfile-71 Max Mekenya 2017-03-17 10:32:04 +1000
  • 4e443cec09 Merge branch 'master' into feature-intl Max Mekenya 2017-03-17 10:08:21 +1000
  • 528b60eb17 fixing Volumes and Workdir Ignacio Cabrera 2017-03-16 21:03:04 -0300
  • aedc7c8438 edit the docs Mahmoud Zalt 2017-03-16 19:28:01 -0400
  • ec4ccb4a20 Move CNAME from the docs to the DOC.. Mahmoud Zalt 2017-03-16 18:33:29 -0400
  • de6040a14d move the documentation markdown files outside the generated html folder v5.0.0 Mahmoud Zalt 2017-03-16 17:44:14 -0400
  • e0e4616ae0 update installation steps in the docs (.env) Mahmoud Zalt 2017-03-16 17:03:05 -0400
  • c00fe5d7e0 Merge branch 'multiple-projects-improvement' Mahmoud Zalt 2017-03-16 16:10:28 -0400
  • 30cf27e011 Fix `nginx: [emerg] BIO_new_file("/var/certs/cert1.pem") failed (SSL: error:02001002:system library:fopen:No such file or directory:fopen('/var/certs/cert1.pem','r') error:2006D080:BIO routines:BIO_new_file:no such file)` Mahmoud Zalt 2017-03-16 15:56:37 -0400
  • dcec8a46a8 replace the links with depends_on in the docker-compose file Mahmoud Zalt 2017-03-16 15:11:04 -0400
  • 1c7e2e7d85 Merge pull request #684 from laradock/revert-639-master v4.20.0 Mahmoud Zalt 2017-03-16 14:41:13 -0400
  • 1d6583e97e Revert "Add apache conf file for specific virtualhost ServerName" Mahmoud Zalt 2017-03-16 14:40:45 -0400
  • 1cf5bcde62 Merge pull request #682 from MauricioTRS/master Mahmoud Zalt 2017-03-16 13:35:24 -0400
  • db40c67f75 Merge pull request #639 from tiknil/master Mahmoud Zalt 2017-03-16 13:30:14 -0400
  • e10ba9fa9f Merge pull request #617 from alchimik/patch-1 Mahmoud Zalt 2017-03-16 13:28:28 -0400
  • a42a295951 Merge pull request #485 from AliveCorpse/feature/workspace_with_php_7.1 Mahmoud Zalt 2017-03-16 13:26:36 -0400
  • 0678415663 Merge pull request #484 from AliveCorpse/feature/php_fpm_v7.1 Mahmoud Zalt 2017-03-16 13:26:14 -0400
  • 73a3745cc3 Merge pull request #370 from philtrep/certbot Mahmoud Zalt 2017-03-16 13:25:15 -0400
  • bed0fd9bdb Elasticsearch - Fix plugins directory MauricioTRS 2017-03-16 14:24:56 -0300
  • 3f1d4b70a6 Merge pull request #650 from wayanjimmy/feature/mailhog Mahmoud Zalt 2017-03-16 13:23:28 -0400
  • 218ffe641e Merge pull request #659 from thorerik/fix-issue-619 Mahmoud Zalt 2017-03-16 13:21:17 -0400
  • be39e93ea2 Merge pull request #672 from cabrerabywaters/GOHSTSCRIPT_SUPPORT Mahmoud Zalt 2017-03-16 13:11:08 -0400
  • 783c9321c9 Merge pull request #679 from davidvleung/master Mahmoud Zalt 2017-03-16 13:10:00 -0400
  • c62ce7d36f Update docker-compose.yml Max Mekenya 2017-03-16 09:59:52 +1000
  • 8ee2229c84 intl support Max Mekenya 2017-03-16 09:59:05 +1000
  • 735647bdf7 Refine container definition David Leung 2017-03-15 13:51:54 -1000
  • f61535427c Merge pull request #677 from Mvzundert/multiple-projects-improvement Mahmoud Zalt 2017-03-15 18:36:49 -0400
  • 0d41c3d65e updated env-example and removed .env.example Marius van Zundert 2017-03-15 09:12:07 +0100
  • cbd3cf7c20 Adding php-worker container to docker-compose Ignacio Cabrera 2017-03-14 11:06:45 -0300
  • d505871faf Adding php-worker for Laravel Ignacio Cabrera 2017-03-14 11:05:22 -0300
  • 9c14954ff4 Adding GHOSTSCRIPT support Ignacio Cabrera 2017-03-14 10:59:38 -0300
  • fd0cbff16c Adding ARG to docker-compose Ignacio Cabrera 2017-03-14 10:58:35 -0300
  • 246814874c Adding Arg to docker-compose Ignacio Cabrera 2017-03-14 10:49:44 -0300
  • 1250668267 Adding MSSQL Support Ignacio Cabrera 2017-03-14 10:47:10 -0300
  • d616545268 Merge pull request #19 from laradock/master Luciano Jr 2017-03-14 13:00:16 +0000
  • faa42d8651 Merge branch 'Mvzundert-multiple_frameworks' Mahmoud Zalt 2017-03-13 21:03:58 -0400
  • ab1d5bae95 complete missings Mahmoud Zalt 2017-03-13 21:03:31 -0400
  • 7f27073a4e Merge branch 'multiple_frameworks' of https://github.com/Mvzundert/laradock into Mvzundert-multiple_frameworks Mahmoud Zalt 2017-03-13 19:29:30 -0400
  • 1a80385a48 change some desgins in the docs site Mahmoud Zalt 2017-03-10 13:48:13 -0500
  • c88e690bb4 Merge branch 'master' into master ZeroC0D3 Team 2017-03-10 08:09:07 +0700
  • c1de398acc Change default phpmyadmin environment for mysql ZeroC0D3 Team 2017-03-10 07:53:33 +0700
  • 73f7c88122 Fixing environment in docker-compose file ZeroC0D3 Team 2017-03-09 19:21:36 +0700
  • f7b94ac599 Merge branch 'non-framework' into multiple_frameworks Marius van Zundert 2017-03-09 09:33:40 +0100
  • ff39e6045d Merge branch 'multiple_frameworks' of github.com:Mvzundert/laradock into multiple_frameworks Marius van Zundert 2017-03-09 09:32:13 +0100
  • 07ebd5f69b Fixed merge conflicts when merging upstream with master Marius van Zundert 2017-03-09 09:30:47 +0100
  • 36fcc6674e Seperated mysqli and tokenizer as seperate options without putting them under code igniter Marius van Zundert 2017-03-09 09:29:07 +0100
  • 37ed904f1a add vhost example hchs 2017-03-09 10:26:47 +0800
  • 7a343f168f Updated with laradock master Marius van Zundert 2017-03-08 16:08:42 +0100
  • 0ac0166068 Merge branch 'master' into multiple_frameworks Marius van Zundert 2017-03-08 11:33:20 +0100
  • 048b55186e Fix issue 619 Thor Erik Lie 2017-03-08 09:26:08 +0100
  • 94c6240586 workaround for 'Xdebug breaks on access to class static property' (#654) v4.19.0 alchimik 2017-03-08 13:15:46 +0800
  • 178d7e1505 fix selenium (#655) alchimik 2017-03-08 12:57:18 +0800
  • 082a73ee33 Bump NVM script version to 0.33.1 (#658) Max Mekenya 2017-03-08 14:56:35 +1000
  • 57ecd6e515 Merge pull request #18 from laradock/master Luciano Jr 2017-03-07 13:22:10 +0000
  • 25c2768557 Apache should just go to /var/www not /var/www/public when supporting multiple projects Marius van Zundert 2017-03-06 22:26:17 +0100
  • 1d918a71d8 fixed example and docker-compose.yml Marius van Zundert 2017-03-06 22:20:31 +0100
  • 9e3f8dd43d fixed merge conflicts Marius van Zundert 2017-03-06 21:25:16 +0100
  • 164b699f24 Merge pull request #653 from thorerik/add-minio Mahmoud Zalt 2017-03-06 09:37:56 -0500
  • c63bf5ea07 Revert "Docs updated" Thor Erik Lie 2017-03-05 15:07:29 +0100
  • 46fcb9e09c Fixed php-fpm variables and example Marius van Zundert 2017-03-06 09:31:11 +0100
  • 603010cbd5 Split up mysqli and tokenizer Marius van Zundert 2017-03-06 09:03:12 +0100
  • d95b52b7db Docs updated Thor Erik Lie 2017-03-05 15:07:29 +0100
  • a7503ce3f3 Add Minio container Thor Erik Lie 2017-03-05 15:06:22 +0100
  • 48710f19c3 Sync with master Wayan Jimmy 2017-03-04 02:10:34 +0800
  • 0983cc98fe Setup mailhog Wayan Jimmy 2017-03-04 02:07:29 +0800
  • 6be81f05c2 - Aggiunto servizio php-worker per avviamento queue Riccardo Tribbia 2017-03-02 12:14:38 +0100
  • 84b742315a Update README-zh.md (#648) David Chen 2017-03-02 16:56:35 +0800