Merge remote-tracking branch 'origin/0.8'

Conflicts: app/config/database.php app/config/local/queue.php app/config/local/session.php app/config/log.php app/config/platform.php app/config/remote.php app/config/testing/mail.php app/config/testing/queue.php app/config/views.php app/filters.php app/start/global.php app/views/partials/footer.blade.php bootstrap/paths.php composer.lock server.php src/Models/Relations/Interfaces/HasManyCommentsInterface.php src/Models/Relations/Interfaces/HasManyEventsInterface.php src/Models/Relations/Interfaces/HasManyPagesInterface.php src/Models/Relations/Interfaces/HasManyPostsInterface.php src/Presenters/PagePresenter.php src/Providers/EventProvider.php src/Providers/PostProvider.php src/Subscribers/CoreSubscriber.php
demonchung · Jan 4, 2015 · e410ed1 · e410ed1
2 parents cf8489b + 44b300f
commit e410ed1
Show file tree

Hide file tree

Showing 121 changed files with 570 additions and 1,348 deletions.
diff --git a/app/BootstrapCMSServiceProvider.php b/app/BootstrapCMSServiceProvider.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS;
@@ -21,9 +16,7 @@
 /**
  * This is the bootstrap cms service provider class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class BootstrapCMSServiceProvider extends ServiceProvider
 {

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Console;
@@ -21,9 +16,7 @@
 /**
  * This is the console kernel class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class Kernel extends ConsoleKernel
 {

diff --git a/app/Facades/CommentRepository.php b/app/Facades/CommentRepository.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the comment repository facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class CommentRepository extends Facade
 {

diff --git a/app/Facades/EventRepository.php b/app/Facades/EventRepository.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the event repository facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class EventRepository extends Facade
 {

diff --git a/app/Facades/NavigationFactory.php b/app/Facades/NavigationFactory.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the navigation factory facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class NavigationFactory extends Facade
 {

diff --git a/app/Facades/PageRepository.php b/app/Facades/PageRepository.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the page repository facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class PageRepository extends Facade
 {

diff --git a/app/Facades/PostRepository.php b/app/Facades/PostRepository.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the post repository facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class PostRepository extends Facade
 {

diff --git a/app/Http/Controllers/AbstractController.php b/app/Http/Controllers/AbstractController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Http\Controllers;
@@ -23,9 +18,7 @@
 /**
  * This is the abstract controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 abstract class AbstractController extends Controller
 {

diff --git a/app/Http/Controllers/CachingController.php b/app/Http/Controllers/CachingController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Http\Controllers;
@@ -21,9 +16,7 @@
 /**
  * This is the caching controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class CachingController extends AbstractController
 {

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Http\Controllers;
@@ -33,9 +28,7 @@
 /**
  * This is the comment controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class CommentController extends AbstractController
 {

diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Http\Controllers;
@@ -27,9 +22,7 @@
 /**
  * This is the event controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class EventController extends AbstractController
 {

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Bootstrap CMS by Graham Campbell.
+ * This file is part of Bootstrap CMS.
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\BootstrapCMS\Http\Controllers;
@@ -27,9 +22,7 @@
 /**
  * This is the page controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class PageController extends AbstractController
 {