Skip to content
This repository was archived by the owner on Jan 18, 2018. It is now read-only.

Commit fdf0d40

Browse files
GrahamCampbellGrahamCampbell
committed
Merge pull request #28 from GrahamCampbell/develop
Release V0.3 Alpha
2 parents 342d2b5 + ca7b905 commit fdf0d40

File tree

105 files changed

+3791
-1479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3791
-1479
lines changed

‎.scrutinizer.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
filter:
2+
excluded_paths: [app/config,app/config/*,app/libraries,app/libraries/*]
3+
4+
tools:
5+
php_mess_detector:
6+
enabled: true
7+
config:
8+
rulesets: [phpmd.xml]
9+
php_cpd:
10+
enabled: true
11+
excluded_dirs: [,app/config,app/config/*,app/libraries,app/libraries/*]
12+
php_pdepend:
13+
enabled: true
14+
excluded_dirs: [app/config,app/config/*,app/libraries,app/libraries/*]

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

3-
php:
4-
- 5.3
3+
php:
54
- 5.4
65
- 5.5
76

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,34 @@ CHANGE LOG
22
==========
33

44

5+
## V0.3 Alpha (09/08/2013)
6+
#### Minor Release
7+
8+
* Added native support for Cloudflare proxies
9+
* Added proper model deletion
10+
* Added an actual profile page
11+
* Added user management
12+
* Added more tests
13+
* Added the use of php traits
14+
* Added support for scrutinizer-ci
15+
* More test refactoring
16+
* Major refactor of the Account Controller
17+
* Improved the controller permissions system
18+
* Fixed bootstrap switch
19+
* Fixed the comment controller
20+
* Fixed some account bugs
21+
* Fixed some form errors
22+
* Fixed some code complexity
23+
* Fixed some unused variables
24+
* Tweaked markdown support
25+
* Registration now requires names
26+
* Some css tweaks
27+
* Some minor model tweaks
28+
* Cleaned up the views
29+
* Fixed composer.json
30+
* Updated seeding
31+
32+
533
## V0.2 Alpha (05/08/2013)
634
#### Major Release
735

‎README.md‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ Bootstrap-CMS
22
=============
33

44

5-
Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013
5+
[![Latest Stable Version](https://poser.pugx.org/gjc/bootstrap-cms/v/stable.png)](https://packagist.org/packages/gjc/bootstrap-cms)
6+
[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=master)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
7+
[![Latest Unstable Version](https://poser.pugx.org/gjc/bootstrap-cms/v/unstable.png)](https://packagist.org/packages/gjc/bootstrap-cms)
8+
[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=develop)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
9+
[![Total Downloads](https://poser.pugx.org/gjc/bootstrap-cms/downloads.png)](https://packagist.org/packages/gjc/bootstrap-cms)
10+
[![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/)
11+
[![Still Maintained](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS.png)](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS)
612

713

8-
[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=master)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
14+
Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013
15+
916

1017
## THIS ALPHA RELEASE IS FOR TESTING ONLY
1118

@@ -14,10 +21,11 @@ Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013
1421

1522
Bootstrap CMS is a PHP CMS powered by [Laravel 4.0](http://laravel.com) with [Sentry 2.0](http://docs.cartalyst.com/sentry-2).
1623

17-
* Bootstrap CMS, in its current form, is maintained by [Graham Campbell](https://github.com/GrahamCampbell).
18-
* 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.
24+
* Bootstrap CMS was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell).
25+
* Bootstrap CMS uses [Travis CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run tests to check if it's working as it should.
26+
* Bootstrap CMS uses [Scrutinizer CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run additional tests and checks.
1927
* Bootstrap CMS uses [Composer](https://getcomposer.org) to load and manage dependencies.
20-
* 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).
28+
* 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).
2129
* Bootstrap CMS is licensed under the GNU AGPLv3, available [here](https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md).
2230

2331

@@ -40,7 +48,7 @@ Basically, expect no support what so ever. This includes, but is not exclusive t
4048

4149
Bootstrap CMS was designed to run on a Linux machine with PHP 5.4 and MySQL 5.5.
4250

43-
* PHP 5.3.7+ or PHP 5.4+ is required. PHP 5.5+ may work, but is untested.
51+
* PHP 5.4+ or PHP 5.5+ is required.
4452
* MySQL 5.1+, 5.5+, or 5.6+ is required. MySQL 5.7+ may work, but is untested.
4553
* You will need [Composer](https://getcomposer.org) installed to load the dependencies of Bootstrap CMS.
4654
* 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.
5361

5462
1. You may install by cloning from github, or via composer.
5563
* Github: "git clone [email protected]:GrahamCampbell/Bootstrap-CMS.git"
56-
* Composer: "composer create-project gjc/bootstrap-cms"
64+
* Composer: "composer create-project gjc/bootstrap-cms cms dev-master"
65+
* You can swap out "dev-master" for "dev-develop", or any release tag.
5766
2. From a command line open in the folder, run "composer install".
5867
3. Navigate to app/config, and adjust the config accordingly.
5968
* If you don't want Boostrap CMS to send emails, you can disable that in cms.php

‎app/commands/AppInstall.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
class AppInstall extends AppCommand {
44

5-
protected $name = 'app:install';
6-
5+
protected $name = 'app:install';
76
protected $description = 'Installs Bootstrap CMS';
87

98
/**

‎app/commands/AppReset.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
class AppReset extends AppCommand {
44

5-
protected $name = 'app:reset';
6-
5+
protected $name = 'app:reset';
76
protected $description = 'Resets And Installs Bootstrap CMS';
87

98
/**

‎app/commands/AppUpdate.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
class AppUpdate extends AppCommand {
44

5-
protected $name = 'app:update';
6-
5+
protected $name = 'app:update';
76
protected $description = 'Updates Bootstrap CMS';
87

98
/**

‎app/config/packages/jasonlewis/basset/config.php‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434
$collection->stylesheet('bootstrap-responsive.min.css');
3535
$collection->stylesheet('font-awesome.min.css');
3636
$collection->stylesheet('bootstrap-select.min.css');
37-
$collection->stylesheet('main.css');
37+
$collection->stylesheet('main.css')->apply('CssMin');
3838
});
3939
$directory->apply('UriRewriteFilter');
4040

4141
$directory = $collection->directory('js', function($collection) {
42-
$collection->javascript('jquery-2.0.3.min.js');
42+
$collection->javascript('jquery-1.10.2.min.js');
43+
$collection->javascript('respond.min.js');
4344
$collection->javascript('bootstrap.min.js');
4445
$collection->javascript('restfulizer.js');
4546
$collection->javascript('bootstrap-select.min.js');
@@ -52,6 +53,7 @@
5253
$directory = $collection->directory('css', function($collection) {
5354
$collection->stylesheet('edit.css');
5455
});
56+
$directory->apply('CssMin');
5557
$directory->apply('UriRewriteFilter');
5658

5759
$directory = $collection->directory('js', function($collection) {
@@ -62,10 +64,24 @@
6264
$directory->apply('JsMin');
6365
},
6466

67+
'markdown' => function($collection) {
68+
$directory = $collection->directory('css', function($collection) {
69+
$collection->stylesheet('bootstrap-markdown.min.css');
70+
});
71+
$directory->apply('CssMin');
72+
$directory->apply('UriRewriteFilter');
73+
74+
$directory = $collection->directory('js', function($collection) {
75+
$collection->javascript('bootstrap-markdown.js');
76+
});
77+
$directory->apply('JsMin');
78+
},
79+
6580
'switches' => function($collection) {
6681
$directory = $collection->directory('css', function($collection) {
6782
$collection->stylesheet('bootstrap-switch.css');
6883
});
84+
$directory->apply('CssMin');
6985
$directory->apply('UriRewriteFilter');
7086

7187
$directory = $collection->directory('js', function($collection) {
@@ -74,13 +90,15 @@
7490
$directory->apply('JsMin');
7591
},
7692

77-
'lightbox' => function($collection) {
93+
'images' => function($collection) {
7894
$directory = $collection->directory('css', function($collection) {
7995
$collection->stylesheet('bootstrap-lightbox.min.css');
8096
});
97+
$directory->apply('CssMin');
8198
$directory->apply('UriRewriteFilter');
8299

83100
$directory = $collection->directory('js', function($collection) {
101+
$collection->javascript('jquery.lazyload.min.js');
84102
$collection->javascript('bootstrap-lightbox.min.js');
85103
});
86104
$directory->apply('JsMin');
@@ -90,6 +108,7 @@
90108
$directory = $collection->directory('css', function($collection) {
91109
$collection->stylesheet('logviewer.css');
92110
});
111+
$directory->apply('CssMin');
93112
$directory->apply('UriRewriteFilter');
94113

95114
$directory = $collection->directory('js', function($collection) {
@@ -102,6 +121,7 @@
102121
$directory = $collection->directory('css', function($collection) {
103122
$collection->stylesheet('extra.css');
104123
});
124+
$directory->apply('CssMin');
105125
$directory->apply('UriRewriteFilter');
106126

107127
$directory = $collection->directory('js', function($collection) {

‎app/config/proxy.php‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
| Set an array of trusted proxies, so Laravel knows to grab the client's
1010
| IP address via the HTTP_X_FORWARDED_FOR header.
1111
|
12+
| By default, we are trusting Cloudflare only.
13+
|
1214
| To trust all proxies, use the value '*':
1315
|
1416
| 'proxies' => '*'
@@ -17,7 +19,25 @@
1719

1820
'proxies' => array(
1921

20-
'*',
22+
'204.93.240.0',
23+
'204.93.177.0',
24+
'199.27.128.0',
25+
'173.245.48.0',
26+
'103.21.244.0',
27+
'103.22.200.0',
28+
'103.31.4.0',
29+
'141.101.64.0',
30+
'108.162.192.0',
31+
'190.93.240.0',
32+
'188.114.96.0',
33+
'197.234.240.0',
34+
'198.41.128.0',
35+
'162.158.0.0',
36+
'2400:cb00::',
37+
'2606:4700::',
38+
'2803:f800::',
39+
'2405:b500::',
40+
'2405:8100::',
2141

2242
),
2343

0 commit comments

Comments
 (0)