Merge pull request #28 from GrahamCampbell/develop

Release V0.3 Alpha
BootstrapCMS · Aug 9, 2013 · fdf0d40 · fdf0d40
2 parents 342d2b5 + ca7b905
commit fdf0d40
Show file tree

Hide file tree

Showing 105 changed files with 3,791 additions and 1,479 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -0,0 +1,14 @@
+filter:
+    excluded_paths: [app/config,app/config/*,app/libraries,app/libraries/*]
+
+tools:
+    php_mess_detector:
+        enabled: true
+        config:
+            rulesets: [phpmd.xml]
+    php_cpd:
+        enabled: true
+        excluded_dirs: [,app/config,app/config/*,app/libraries,app/libraries/*]
+    php_pdepend:
+        enabled: true
+        excluded_dirs: [app/config,app/config/*,app/libraries,app/libraries/*]
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
-php: 
-  - 5.3
+php:
   - 5.4
   - 5.5
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,34 @@ CHANGE LOG
 ==========
 
 
+## V0.3 Alpha (09/08/2013)
+#### Minor Release
+
+* Added native support for Cloudflare proxies
+* Added proper model deletion
+* Added an actual profile page
+* Added user management
+* Added more tests
+* Added the use of php traits
+* Added support for scrutinizer-ci
+* More test refactoring
+* Major refactor of the Account Controller
+* Improved the controller permissions system
+* Fixed bootstrap switch
+* Fixed the comment controller
+* Fixed some account bugs
+* Fixed some form errors
+* Fixed some code complexity
+* Fixed some unused variables
+* Tweaked markdown support
+* Registration now requires names
+* Some css tweaks
+* Some minor model tweaks
+* Cleaned up the views
+* Fixed composer.json
+* Updated seeding
+
+
 ## V0.2 Alpha (05/08/2013)
 #### Major Release
 

diff --git a/README.md b/README.md
@@ -2,10 +2,17 @@ Bootstrap-CMS
 =============
 
 
-Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013  
+[![Latest Stable Version](https://poser.pugx.org/gjc/bootstrap-cms/v/stable.png)](https://packagist.org/packages/gjc/bootstrap-cms)
+[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=master)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
+[![Latest Unstable Version](https://poser.pugx.org/gjc/bootstrap-cms/v/unstable.png)](https://packagist.org/packages/gjc/bootstrap-cms)
+[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=develop)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
+[![Total Downloads](https://poser.pugx.org/gjc/bootstrap-cms/downloads.png)](https://packagist.org/packages/gjc/bootstrap-cms)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/GrahamCampbell/Bootstrap-CMS/badges/quality-score.png?s=df19b33e11d486109decb5c9c78b1d7d049ddde6)](https://scrutinizer-ci.com/g/GrahamCampbell/Bootstrap-CMS/)
+[![Still Maintained](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS.png)](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS)
 
 
-[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=master)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
+Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013  
+
 
 ## THIS ALPHA RELEASE IS FOR TESTING ONLY
 
@@ -14,10 +21,11 @@ Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013
 
 Bootstrap CMS is a PHP CMS powered by [Laravel 4.0](http://laravel.com) with [Sentry 2.0](http://docs.cartalyst.com/sentry-2).  
 
-* Bootstrap CMS, in its current form, is maintained by [Graham Campbell](https://github.com/GrahamCampbell).  
-* Bootstrap CMS will eventually use [Travis CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run tests to check if it's working as it should.  
+* Bootstrap CMS was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell).  
+* Bootstrap CMS uses [Travis CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run tests to check if it's working as it should.  
+* Bootstrap CMS uses [Scrutinizer CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run additional tests and checks.  
 * Bootstrap CMS uses [Composer](https://getcomposer.org) to load and manage dependencies.  
-* Bootstrap CMS provides a [change log](https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/CHANGELOG.md) and a set of [releases](https://github.com/GrahamCampbell/Bootstrap-CMS/releases).  
+* Bootstrap CMS provides a [change log](https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Bootstrap-CMS/releases), and a [wiki](https://github.com/GrahamCampbell/Bootstrap-CMS/wiki).  
 * Bootstrap CMS is licensed under the GNU AGPLv3, available [here](https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md).  
 
 
@@ -40,7 +48,7 @@ Basically, expect no support what so ever. This includes, but is not exclusive t
 
 Bootstrap CMS was designed to run on a Linux machine with PHP 5.4 and MySQL 5.5.  
 
-* PHP 5.3.7+ or PHP 5.4+ is required. PHP 5.5+ may work, but is untested.  
+* PHP 5.4+ or PHP 5.5+ is required.
 * MySQL 5.1+, 5.5+, or 5.6+ is required. MySQL 5.7+ may work, but is untested.  
 * You will need [Composer](https://getcomposer.org) installed to load the dependencies of Bootstrap CMS.  
 * You will need to configure the site in the app/config folder before production.  
@@ -53,7 +61,8 @@ Please check the system requirements before installing Bootstrap CMS.
 
 1. You may install by cloning from github, or via composer.  
   * Github: "git clone [email protected]:GrahamCampbell/Bootstrap-CMS.git"
-  * Composer: "composer create-project gjc/bootstrap-cms"
+  * Composer: "composer create-project gjc/bootstrap-cms cms dev-master"
+     * You can swap out "dev-master" for "dev-develop", or any release tag.
 2. From a command line open in the folder, run "composer install".  
 3. Navigate to app/config, and adjust the config accordingly.  
   * If you don't want Boostrap CMS to send emails, you can disable that in cms.php

diff --git a/app/commands/AppInstall.php b/app/commands/AppInstall.php
@@ -2,8 +2,7 @@
 
 class AppInstall extends AppCommand {
 
-    protected $name = 'app:install';
-
+    protected $name        = 'app:install';
     protected $description = 'Installs Bootstrap CMS';
 
     /**

diff --git a/app/commands/AppReset.php b/app/commands/AppReset.php
@@ -2,8 +2,7 @@
 
 class AppReset extends AppCommand {
 
-    protected $name = 'app:reset';
-
+    protected $name        = 'app:reset';
     protected $description = 'Resets And Installs Bootstrap CMS';
 
     /**

diff --git a/app/commands/AppUpdate.php b/app/commands/AppUpdate.php
@@ -2,8 +2,7 @@
 
 class AppUpdate extends AppCommand {
 
-    protected $name = 'app:update';
-
+    protected $name        = 'app:update';
     protected $description = 'Updates Bootstrap CMS';
 
     /**

diff --git a/app/config/packages/jasonlewis/basset/config.php b/app/config/packages/jasonlewis/basset/config.php
@@ -34,12 +34,13 @@
                 $collection->stylesheet('bootstrap-responsive.min.css');
                 $collection->stylesheet('font-awesome.min.css');
                 $collection->stylesheet('bootstrap-select.min.css');
-                $collection->stylesheet('main.css');
+                $collection->stylesheet('main.css')->apply('CssMin');
             });
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {
-                $collection->javascript('jquery-2.0.3.min.js');
+                $collection->javascript('jquery-1.10.2.min.js');
+                $collection->javascript('respond.min.js');
                 $collection->javascript('bootstrap.min.js');
                 $collection->javascript('restfulizer.js');
                 $collection->javascript('bootstrap-select.min.js');
@@ -52,6 +53,7 @@
             $directory = $collection->directory('css', function($collection) {
                 $collection->stylesheet('edit.css');
             });
+            $directory->apply('CssMin');
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {
@@ -62,10 +64,24 @@
             $directory->apply('JsMin');
         },
 
+        'markdown' => function($collection) {
+            $directory = $collection->directory('css', function($collection) {
+                $collection->stylesheet('bootstrap-markdown.min.css');
+            });
+            $directory->apply('CssMin');
+            $directory->apply('UriRewriteFilter');
+
+            $directory = $collection->directory('js', function($collection) {
+                $collection->javascript('bootstrap-markdown.js');
+            });
+            $directory->apply('JsMin');
+        },
+
         'switches' => function($collection) {
             $directory = $collection->directory('css', function($collection) {
                 $collection->stylesheet('bootstrap-switch.css');
             });
+            $directory->apply('CssMin');
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {
@@ -74,13 +90,15 @@
             $directory->apply('JsMin');
         },
 
-        'lightbox' => function($collection) {
+        'images' => function($collection) {
             $directory = $collection->directory('css', function($collection) {
                 $collection->stylesheet('bootstrap-lightbox.min.css');
             });
+            $directory->apply('CssMin');
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {
+                $collection->javascript('jquery.lazyload.min.js');
                 $collection->javascript('bootstrap-lightbox.min.js');
             });
             $directory->apply('JsMin');
@@ -90,6 +108,7 @@
             $directory = $collection->directory('css', function($collection) {
                 $collection->stylesheet('logviewer.css');
             });
+            $directory->apply('CssMin');
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {
@@ -102,6 +121,7 @@
             $directory = $collection->directory('css', function($collection) {
                 $collection->stylesheet('extra.css');
             });
+            $directory->apply('CssMin');
             $directory->apply('UriRewriteFilter');
 
             $directory = $collection->directory('js', function($collection) {

diff --git a/app/config/proxy.php b/app/config/proxy.php
@@ -9,6 +9,8 @@
     | Set an array of trusted proxies, so Laravel knows to grab the client's
     | IP address via the HTTP_X_FORWARDED_FOR header.
     |
+    | By default, we are trusting Cloudflare only.
+    |
     | To trust all proxies, use the value '*':
     |
     | 'proxies' => '*'
@@ -17,7 +19,25 @@
 
     'proxies' => array(
 
-        '*',
+        '204.93.240.0',
+        '204.93.177.0',
+        '199.27.128.0',
+        '173.245.48.0',
+        '103.21.244.0',
+        '103.22.200.0',
+        '103.31.4.0',
+        '141.101.64.0',
+        '108.162.192.0',
+        '190.93.240.0',
+        '188.114.96.0',
+        '197.234.240.0',
+        '198.41.128.0',
+        '162.158.0.0',
+        '2400:cb00::',
+        '2606:4700::',
+        '2803:f800::',
+        '2405:b500::',
+        '2405:8100::',
 
     ),