Merge branch 'master' into feature/composer

Conflicts:
	vendor/ZendFramework

diff --git a/config/application.config.php b/config/application.config.php
index e8868a3..6e62784 100644 (file)
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -4,6 +4,9 @@ return array(
         'Application',
     ),
     'module_listener_options' => array( 
+        'config_glob_paths'    => array(
+            'config/autoload/{,*.}{global,local}.php',
+        ),
         'config_cache_enabled' => false,
         'cache_dir'            => 'data/cache',
         'module_paths' => array(

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index b68e949..8015ff5 100644 (file)
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -11,7 +11,7 @@ return array(
                         'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
                     ),
                     'defaults' => array(
-                        'controller' => 'IndexController',
+                        'controller' => 'index',
                         'action'     => 'index',
                     ),
                 ),
@@ -21,7 +21,7 @@ return array(
                 'options' => array(
                     'route'    => '/',
                     'defaults' => array(
-                        'controller' => 'IndexController',
+                        'controller' => 'index',
                         'action'     => 'index',
                     ),
                 ),
@@ -30,7 +30,7 @@ return array(
     ),
     'controller' => array(
         'classes' => array(
-            'IndexController' => 'Application\Controller\IndexController'
+            'index' => 'Application\Controller\IndexController'
         ),
     ),
     'view_manager' => array(

diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
new file mode 100644 (file)
index 0000000..c9ba100
--- /dev/null
+++ b/module/Application/view/application/index/index.phtml
@@ -0,0 +1,25 @@
+  <div class="hero-unit">
+    <h1>Welcome to <span class="zf-green">Zend Framework 2</span></h1>
+    <p>Congratulations! You have successfully installed the <a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">ZF2 Skeleton Application</a>. You are currently running Zend Framework version <?php echo \Zend\Version::VERSION ?>. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.</p>
+    <p><a class="btn btn-success btn-large" href="https://github.com/zendframework/zf2" target="_blank">Fork Zend Framework 2 on GitHub &raquo;</a></p>
+  </div>
+
+  <div class="row">
+    <div class="span4">
+      <h2>Follow Development</h2>
+        <p>Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework webiste which provides links to the ZF2 <a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">wiki</a>, <a href="http://framework.zend.com/zf2/blog">dev blog</a>, <a href="http://framework.zend.com/issues/browse/ZF2">issue tracker</a>, and much more. This is a great resource for staying up to date with the latest developments!</p>
+      <p><a class="btn btn-success" href="http://framework.zend.com/zf2" target="_blank">ZF2 Development Portal &raquo;</a></p>
+
+    </div>
+    <div class="span4">
+      <h2>Discover Modules</h2>
+       <p>The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available <a href="https://github.com/zendframework/modules.zendframework.com">on GitHub</a>. The site is currently live and currently contains a list of some of the modules already available for ZF2.</p>
+      <p><a class="btn btn-success" href="http://modules.zendframework.com/" target="_blank">Explore ZF2 Modules &raquo;</a></p>
+   </div>
+   <div class="span4">
+
+     <h2>Help &amp; Support</h2>
+     <p>If you need any help or support while developing with ZF2, you may reach us via IRC: <a href="irc://irc.freenode.net/zftalk.2">#zftalk.2 on Freenode</a>. We'd love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the <a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">mailing lists</a>.</p>
+     <p><a class="btn btn-success" href="http://webchat.freenode.net?channels=zftalk.2" target="_blank">Ping us on IRC &raquo;</a></p>
+   </div>
+  </div>

diff --git a/module/Application/view/index/index.phtml b/module/Application/view/index/index.phtml
deleted file mode 100644 (file)
index c9ba100..0000000
--- a/module/Application/view/index/index.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-  <div class="hero-unit">
-    <h1>Welcome to <span class="zf-green">Zend Framework 2</span></h1>
-    <p>Congratulations! You have successfully installed the <a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">ZF2 Skeleton Application</a>. You are currently running Zend Framework version <?php echo \Zend\Version::VERSION ?>. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.</p>
-    <p><a class="btn btn-success btn-large" href="https://github.com/zendframework/zf2" target="_blank">Fork Zend Framework 2 on GitHub &raquo;</a></p>
-  </div>
-
-  <div class="row">
-    <div class="span4">
-      <h2>Follow Development</h2>
-        <p>Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework webiste which provides links to the ZF2 <a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">wiki</a>, <a href="http://framework.zend.com/zf2/blog">dev blog</a>, <a href="http://framework.zend.com/issues/browse/ZF2">issue tracker</a>, and much more. This is a great resource for staying up to date with the latest developments!</p>
-      <p><a class="btn btn-success" href="http://framework.zend.com/zf2" target="_blank">ZF2 Development Portal &raquo;</a></p>
-
-    </div>
-    <div class="span4">
-      <h2>Discover Modules</h2>
-       <p>The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available <a href="https://github.com/zendframework/modules.zendframework.com">on GitHub</a>. The site is currently live and currently contains a list of some of the modules already available for ZF2.</p>
-      <p><a class="btn btn-success" href="http://modules.zendframework.com/" target="_blank">Explore ZF2 Modules &raquo;</a></p>
-   </div>
-   <div class="span4">
-
-     <h2>Help &amp; Support</h2>
-     <p>If you need any help or support while developing with ZF2, you may reach us via IRC: <a href="irc://irc.freenode.net/zftalk.2">#zftalk.2 on Freenode</a>. We'd love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the <a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">mailing lists</a>.</p>
-     <p><a class="btn btn-success" href="http://webchat.freenode.net?channels=zftalk.2" target="_blank">Ping us on IRC &raquo;</a></p>
-   </div>
-  </div>

diff --git a/vendor/ZendFramework b/vendor/ZendFramework
new file mode 160000 (submodule)
index 0000000..34376f5
--- /dev/null
+++ b/vendor/ZendFramework
@@ -0,0 +1 @@
+Subproject commit 34376f57128fbdd11f0ca542ce3327dbccec77bd