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

Commit 8295579

Browse files
Merge pull request #42 from GrahamCampbell/develop
Release V0.4 Alpha
2 parents b157cc1 + 33f4f1b commit 8295579

File tree

228 files changed

+6970
-2288
lines changed

Some content is hidden

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

228 files changed

+6970
-2288
lines changed

.scrutinizer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filter:
2-
excluded_paths: [app/config,app/config/*,app/libraries,app/libraries/*]
2+
excluded_paths: [app/config,app/config/*]
33

44
tools:
55
php_mess_detector:
@@ -8,7 +8,7 @@ tools:
88
rulesets: [phpmd.xml]
99
php_cpd:
1010
enabled: true
11-
excluded_dirs: [,app/config,app/config/*,app/libraries,app/libraries/*]
11+
excluded_dirs: [,app/config,app/config/*]
1212
php_pdepend:
1313
enabled: true
14-
excluded_dirs: [app/config,app/config/*,app/libraries,app/libraries/*]
14+
excluded_dirs: [app/config,app/config/*]

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ php:
55
- 5.5
66

77
before_script:
8-
- curl -sS https://getcomposer.org/installer | php
9-
- php composer.phar install
8+
- curl -s http://getcomposer.org/installer | php
9+
- php composer.phar install --dev
1010
- php artisan basset:build --production
1111

1212
script: phpunit

CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@ CHANGE LOG
22
==========
33

44

5+
## V0.4 Alpha (25/08/2013)
6+
#### Major Release
7+
8+
* Made it PSR-0 compliant
9+
* Refactored off the libs to other packages
10+
* Added model providers
11+
* Added events functionality
12+
* Added wysiwyg to posts and events
13+
* Added out of the box IronMQ support
14+
* Added more tests
15+
* Added caching
16+
* Improved models
17+
* Improved queuing
18+
* Improved user management
19+
* Improved commenting
20+
* Allow specifying a separate mail queue
21+
* Major logging and events improvements
22+
* Basic CloudFlare api integration
23+
* Updated the emails
24+
* Minor cleanups
25+
* Fixed some dodgie permissions
26+
* Many other minor fixes
27+
28+
529
## V0.3.1 Alpha (12/08/2013)
630
#### Minor Release
731

@@ -25,7 +49,7 @@ CHANGE LOG
2549

2650

2751
## V0.3 Alpha (09/08/2013)
28-
#### Minor Release
52+
#### Major Release
2953

3054
* Added native support for Cloudflare proxies
3155
* Added proper model deletion

README.md

Lines changed: 59 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
Bootstrap-CMS
1+
Bootstrap CMS
22
=============
33

44

5-
[![Latest Stable Version](https://poser.pugx.org/graham-campbell/bootstrap-cms/v/stable.png)](https://packagist.org/packages/graham-campbell/bootstrap-cms)
5+
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/GrahamCampbell/Bootstrap-CMS/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
66
[![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/graham-campbell/bootstrap-cms/v/unstable.png)](https://packagist.org/packages/graham-campbell/bootstrap-cms)
8-
[![Build Status](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS.png?branch=develop)](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS)
7+
[![Latest Version](https://poser.pugx.org/graham-campbell/bootstrap-cms/v/stable.png)](https://packagist.org/packages/graham-campbell/bootstrap-cms)
98
[![Total Downloads](https://poser.pugx.org/graham-campbell/bootstrap-cms/downloads.png)](https://packagist.org/packages/graham-campbell/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/)
9+
[![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)
1110
[![Still Maintained](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS.png)](http://stillmaintained.com/GrahamCampbell/Bootstrap-CMS)
1211

1312

14-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/GrahamCampbell/Bootstrap-CMS/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
15-
16-
1713
Copyright © [Graham Campbell](https://github.com/GrahamCampbell) 2013
1814

1915

2016
## THIS ALPHA RELEASE IS FOR TESTING ONLY
2117

18+
#### I'd appriciate it if you'd leave my name in the footer unless you have changed my source significatly. If you do feel you have changed it significantly, i'd still appreciate some kind of link back. Thank you, and enjoy!
19+
2220

2321
## What Is Bootstrap CMS?
2422

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

2725
* Bootstrap CMS was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell).
2826
* Bootstrap CMS uses [Travis CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run tests to check if it's working as it should.
29-
* Bootstrap CMS uses [Scrutinizer CI](https://travis-ci.org/GrahamCampbell/Bootstrap-CMS) to run additional tests and checks.
27+
* Bootstrap CMS uses [Scrutinizer CI](https://scrutinizer-ci.com/g/GrahamCampbell/Bootstrap-CMS) to run additional tests and checks.
3028
* Bootstrap CMS uses [Composer](https://getcomposer.org) to load and manage dependencies.
3129
* 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).
3230
* Bootstrap CMS is licensed under the GNU AGPLv3, available [here](https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md).
@@ -63,18 +61,58 @@ Bootstrap CMS was designed to run on a Linux machine with PHP 5.4 and MySQL 5.5.
6361
Please check the system requirements before installing Bootstrap CMS.
6462

6563
1. You may install by cloning from github, or via composer.
66-
* Github: "git clone [email protected]:GrahamCampbell/Bootstrap-CMS.git"
67-
* Composer: "composer create-project graham-campbell/bootstrap-cms cms dev-master"
68-
* You can swap out "dev-master" for "dev-develop", or any release tag.
69-
2. From a command line open in the folder, run "composer install".
70-
3. Navigate to app/config, and adjust the config accordingly.
71-
* If you don't want Boostrap CMS to send emails, you can disable that in cms.php
72-
* If you don't have a cache server like [Redis](http://redis.io), disable caching in cms.php
73-
* If you don't have a queuing server like [Beanstalkd](http://kr.github.io/beanstalkd), set queue.php to use "sync"
74-
4. You can run "php artisan app:install" to setup and seed your database.
75-
* Make sure you setup your database config in database.php.
76-
5. Finally, setup an [Apache VirtualHost](http://httpd.apache.org/docs/current/vhosts/examples.html) to point to the "public" folder.
77-
* For development, you can simply run "php artisan serve"
64+
* Github: `git clone [email protected]:GrahamCampbell/Bootstrap-CMS.git`
65+
* Composer: `composer create-project graham-campbell/bootstrap-cms --prefer-dist`
66+
2. From a command line open in the folder, run `composer install`.
67+
3. Enter your database details into `app/config/databse.php`.
68+
4. Run `php artisan app:install` to setup and seed your database.
69+
5. You will need to enter your mail server details into `app/config/mail.php`.
70+
* You can disable verification emails on registration in `app/config/cms.php`
71+
* Mail is still required for other functions like password resets
72+
* I'd recommend [queuing](#setting-up-queing) email sending for greater performance (see below)
73+
6. Finally, setup an [Apache VirtualHost](http://httpd.apache.org/docs/current/vhosts/examples.html) to point to the "public" folder.
74+
* For development, you can simply run `php artisan serve`
75+
7. Additionally, you may to setup some of Bootstrap CMS's other features (see below).
76+
* Some things, like [caching](#setting-up-caching) and [queuing](#setting-up-queing), are disabled out of the box
77+
* This is to allow Bootstrap CMS to work with minimal setup
78+
79+
80+
## Setting Up Queuing
81+
82+
Note that `beanstalkd` requires a local server, while `sqs` and `iron` are cloud based.
83+
84+
1. Choose your poison - I'd recommend [IronMQ](http://www.iron.io/mq).
85+
2. Enter your queuing server details into `app/config/queue.php`.
86+
3. You can also set a separate mail queue in `app/config/mail.php`.
87+
4. For [IronMQ](http://www.iron.io/mq), the queue subscription path is `/queue/receive`.
88+
5. You can find out more about queuing by heading over to the [Laravel Docs](http://laravel.com/docs/queues).
89+
90+
91+
## Setting Up Caching
92+
93+
Note that caching will not work with Laravel's `file` or `database` cache drivers.
94+
95+
1. Choose your poison - I'd recommend [Redis](http://redis.io).
96+
2. Enter your cache server details into `app/config/cache.php`.
97+
3. Enable Bootstrap CMS's caching in `app/config/cms.php`.
98+
99+
100+
## Setting Up Analytics
101+
102+
Bootstrap CMS natively supports [Google Analytics](http://www.google.com/analytics) (other services to come later).
103+
104+
1. Setup a web property on [Google Analytics](http://www.google.com/analytics).
105+
2. Enter your tracking id into `app/config/analytics.php`.
106+
3. Enable Google Analytics in `app/config/analytics.php`.
107+
108+
109+
## Setting Up Themes
110+
111+
Bootstrap CMS also ships with 13 themes from [Bootswatch](http://bootswatch.com/2).
112+
113+
1. You can set your theme in `app/config/theme.php`.
114+
2. You can also set your nav bar style in `app/config/theme.php`.
115+
3. After making theme changes, you will have to run `php artisan app:update`.
78116

79117

80118
## Updating Your Fork

app/commands/AppCommand.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/commands/AppInstall.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/commands/AppReset.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/commands/AppUpdate.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

app/config/app.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@
114114
'Illuminate\View\ViewServiceProvider',
115115
'Illuminate\Workbench\WorkbenchServiceProvider',
116116
'Cartalyst\Sentry\SentryServiceProvider',
117+
'GrahamCampbell\Security\SecurityServiceProvider',
118+
'GrahamCampbell\Binput\BinputServiceProvider',
119+
'GrahamCampbell\Passwd\PasswdServiceProvider',
120+
'GrahamCampbell\HTMLMin\HTMLMinServiceProvider',
121+
'GrahamCampbell\CoreAPI\CoreAPIServiceProvider',
122+
'GrahamCampbell\CloudFlareAPI\CloudFlareAPIServiceProvider',
123+
'GrahamCampbell\BootstrapCMS\BootstrapCMSServiceProvider',
117124
'VTalbot\Markdown\MarkdownServiceProvider',
118125
'Fideloper\Proxy\ProxyServiceProvider',
119126
'Basset\BassetServiceProvider',
@@ -186,8 +193,22 @@
186193
'Validator' => 'Illuminate\Support\Facades\Validator',
187194
'View' => 'Illuminate\Support\Facades\View',
188195
'Sentry' => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
196+
'Security' => 'GrahamCampbell\Security\Facades\Security',
197+
'Binput' => 'GrahamCampbell\Binput\Facades\Binput',
198+
'Passwd' => 'GrahamCampbell\Passwd\Facades\Passwd',
199+
'HTMLMin' => 'GrahamCampbell\HTMLMin\Facades\HTMLMin',
200+
'CoreAPI' => 'GrahamCampbell\CoreAPI\Facades\CoreAPI',
201+
'CloudFlareAPI' => 'GrahamCampbell\CloudFlareAPI\Facades\CloudFlareAPI',
202+
'CommentProvider' => 'GrahamCampbell\BootstrapCMS\Facades\CommentProvider',
203+
'EventProvider' => 'GrahamCampbell\BootstrapCMS\Facades\EventProvider',
204+
'GroupProvider' => 'GrahamCampbell\BootstrapCMS\Facades\GroupProvider',
205+
'PageProvider' => 'GrahamCampbell\BootstrapCMS\Facades\PageProvider',
206+
'PostProvider' => 'GrahamCampbell\BootstrapCMS\Facades\PostProvider',
207+
'UserProvider' => 'GrahamCampbell\BootstrapCMS\Facades\UserProvider',
208+
'Navigation' => 'GrahamCampbell\BootstrapCMS\Facades\Navigation',
189209
'Markdown' => 'VTalbot\Markdown\Facades\Markdown',
190210
'Basset' => 'Basset\Facade',
211+
'Carbon' => 'Carbon\Carbon',
191212

192213
),
193214

app/config/cms.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@
108108
|
109109
| Requires a caching server like Redis and cache.php to be configured.
110110
|
111-
| Default to true.
111+
| Default to false.
112112
|
113113
*/
114114

115-
'cache' => true,
115+
'cache' => false,
116116

117117
);

0 commit comments

Comments
 (0)