Merge pull request #1102 from ci-bonfire/develop

Release 0.7.2
lonnieezell · Apr 10, 2015 · 3727369 · 3727369
2 parents f67018f + 9bff0a3
commit 3727369
Show file tree

Hide file tree

Showing 467 changed files with 26,873 additions and 16,091 deletions.
diff --git a/README.markdown b/README.markdown
@@ -1,17 +1,20 @@
-# Faster Development of CodeIgniter 2.x Apps
+# Faster Development of CodeIgniter 2.x/3.x Apps
 
 <div style="float: right; margin: 0 20px 20px 0">
 	<a href='http://www.pledgie.com/campaigns/15326'><img alt='Click here to lend your support to: Bonfire - faster CodeIgniter development and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/15326.png?skin_name=chrome' border='0' /></a>
 </div>
 
-That's Bonfire's goal: provide a solid base off of which to build your new web applications. It's not a CMS. Instead, it's a springboard to build off of with many of the tools you wish you had on projects but never took the time to build.
+That's Bonfire's goal: provide a solid base off of which to build your new web applications.
+It's not a CMS.
+Instead, it's a springboard to build off of with many of the tools you wish you had on projects but never took the time to build.
 
 All wrapped up in an elegant interface that will make you proud when you hand the project over to your client.
 
 ## Current Features
 
+- CodeIgniter 2.x included. CodeIgniter 3.x support available with [some minor changes](https://github.com/ci-bonfire/Bonfire/blob/develop/bonfire/docs/ci3.md).
 - Very flexible template/theme system, capable of Wordpress-like parent/child themes.
-- Uses Twitter Bootstrap for the Admin and Default themes
+- Uses Twitter Bootstrap 2.x for the Admin and Default themes
 - Fully modular and built around HMVC
 - 4 ‘contexts’ ready for your code: Content, Reports, Settings and Developer Tools
 - Database backup and maintenance interface
@@ -36,18 +39,17 @@ Follow Bonfire's progress and commits at Twitter by following [cibonfire](http:/
 
 If you're interested in helping out, fork the project and start coding! I'd love to have you on board. You can always shoot me an email at lonnieje@gmail.com and we can talk about how you'll best fit it and what the best place to start coding would be.
 
-
 Let's make this the best kick-start to any CodeIgniter project.
 
-## Bug Reports 
+## Bug Reports
 
-We strive to make Bonfire a solid base to work with.  In doing so your Bug Reports are very vital to us.  Before making a Bug Report please check the existing
-[Issue Tracker](https://github.com/ci-bonfire/Bonfire/issues) , if the bug you have found does not exist in the issue tracker already, please text a minute to read the [guide lines](https://github.com/ci-bonfire/Bonfire/wiki/Issue-Tracking-and-Pull-Requests) to making a Good Bug report.
+We strive to make Bonfire a solid base to work with. In doing so your Bug Reports are very vital to us. Before making a Bug Report please check the existing
+[Issue Tracker](https://github.com/ci-bonfire/Bonfire/issues) , if the bug you have found does not exist in the issue tracker already, please text a minute to read the [guide lines](http://cibonfire.com/docs/developer/issue_tracking_and_pull_requests) to making a Good Bug report.
 
 
 ## The Team
 
-The Bonfire Team is made up from developers around the world interested in making Bonfire a better kickstart for your [CodeIgniter](http://codeigniter.com) projects.
+The Bonfire Team is made up of developers from around the world interested in making Bonfire a better kickstart for your [CodeIgniter](http://codeigniter.com) projects.
 
 - [Lonnie Ezell](http://lonnieezell.com) - Lead Developer
 - [Mat Whitney](https://github.com/mwhitneysdsu)

diff --git a/application/archives/config/index.html b/application/archives/config/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 	<title>403 Forbidden</title>

diff --git a/application/archives/index.html b/application/archives/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 	<title>403 Forbidden</title>

diff --git a/application/cache/index.html b/application/cache/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 	<title>403 Forbidden</title>

diff --git a/application/config/application.php b/application/config/application.php
@@ -71,9 +71,12 @@
 //------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------
-// SITE PATH
+// Paths
 //------------------------------------------------------------------------------
 
+//------------------------------------------------------------------------------
+// SITE PATH
+//------------------------------------------------------------------------------
 // The path to the root folder that holds the application. This does not have to
 // be the site root folder, or even the folder defined in FCPATH.
 $config['template.site_path']	= FCPATH;
@@ -86,6 +89,10 @@
 // Paths are relative to the FCPATH.
 $config['template.theme_paths'] = array('themes');
 
+//------------------------------------------------------------------------------
+// Layouts
+//------------------------------------------------------------------------------
+
 //------------------------------------------------------------------------------
 // DEFAULT LAYOUT
 //------------------------------------------------------------------------------
@@ -102,7 +109,11 @@
 $config['template.ajax_layout'] = 'ajax';
 
 //------------------------------------------------------------------------------
-// USE THEMES?
+// Themes
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+// USE MOBILE THEMES?
 //------------------------------------------------------------------------------
 // When set to true, the Template library will check the user agent during the
 // rendering process, and check the UA against the template.themes (below),
@@ -126,11 +137,8 @@
 $config['template.admin_theme'] = 'admin';
 
 //------------------------------------------------------------------------------
-// PARSE VIEWS
+// Templates
 //------------------------------------------------------------------------------
-// If set to true, views will be parsed via CodeIgniter's parser.
-// If false, views will be considered PHP views only.
-$config['template.parse_views'] = false;
 
 //------------------------------------------------------------------------------
 // MESSAGE TEMPLATE
@@ -152,6 +160,16 @@
 //------------------------------------------------------------------------------
 $config['template.breadcrumb_symbol']	= ' : ';
 
+//------------------------------------------------------------------------------
+// Settings
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+// PARSE VIEWS
+//------------------------------------------------------------------------------
+// If set to true, views will be parsed via CodeIgniter's parser.
+// If false, views will be considered PHP views only.
+$config['template.parse_views'] = false;
 
 //------------------------------------------------------------------------------
 // !ASSETS
@@ -172,8 +190,8 @@
 
 // The 'assets.js_opener' and 'assets.js_closer' strings are used to wrap all
 // inline scripts. By default, these are setup to work with jQuery.
-$config['assets.js_opener'] = "$(document).ready(function() {\n";
-$config['assets.js_closer'] = "});\n";
+$config['assets.js_opener'] = "$(document).ready(function() {";
+$config['assets.js_closer'] = "});";
 
 // The 'assets.css_combine' and 'assets.js_combine' settings tell the Assets
 // library whether css and js files, respectively, should be combined.
@@ -255,3 +273,21 @@
 //------------------------------------------------------------------------------
 $config['migrate.auto_core'] = false;
 $config['migrate.auto_app']  = false;
+
+//------------------------------------------------------------------------------
+// CommonMark library used by Docs module
+//------------------------------------------------------------------------------
+// The valid_drivers array will be merged with the valid_drivers array defined in
+// the CommonMark library, so the MarkdownExtended driver will remain useable even
+// if it is not included in the configured list.
+$config['commonmark.valid_drivers'] = array(
+    'Parsedown',
+    'Markdown',
+    'MarkdownExtra',
+    'LeagueCommonMark',
+);
+// This is the driver configured to be used by the CommonMark library. The driver
+// will be loaded from either /bonfire/libraries/CommonMark/drivers/ or
+// /application/libraries/CommonMark/drivers/ (capitalization is important on most
+// servers). The file name for the driver must be CommonMark_{drivername}.php
+$config['commonmark.driver'] = 'MarkdownExtended';
diff --git a/application/config/autoload.php b/application/config/autoload.php
@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER
@@ -20,16 +22,17 @@
 |
 | 1. Packages
 | 2. Libraries
-| 3. Helper files
-| 4. Custom config files
-| 5. Language files
-| 6. Models
+| 3. Drivers
+| 4. Helper files
+| 5. Custom config files
+| 6. Language files
+| 7. Models
 |
 */
 
 /*
 | -------------------------------------------------------------------
-|  Auto-load Packges
+|  Auto-load Packages
 | -------------------------------------------------------------------
 | Prototype:
 |
@@ -39,9 +42,8 @@
 
 $autoload['packages'] = array(
 		realpath(APPPATH .'../bonfire'),	// Bonfire Core
-		APPPATH.'third_party'				// App -specific 3rd-party libs.
-	);
-
+    APPPATH . 'third_party',          // App -specific 3rd-party libs.
+);
 
 /*
 | -------------------------------------------------------------------
@@ -52,12 +54,32 @@
 |
 | Prototype:
 |
-|	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
+|	$autoload['libraries'] = array('database', 'email', 'session');
+|
+| You can also supply an alternative library name to be assigned
+| in the controller:
+|
+|	$autoload['libraries'] = array('user_agent' => 'ua');
 */
 
 $autoload['libraries'] = array('database', 'session');
 
 
+/*
+| -------------------------------------------------------------------
+|  Auto-load Drivers
+| -------------------------------------------------------------------
+| These classes are located in the system/libraries folder or in your
+| application/libraries folder within their own subdirectory. They
+| offer multiple interchangeable driver options.
+|
+| Prototype:
+|
+|	$autoload['drivers'] = array('cache');
+*/
+
+$autoload['drivers'] = array();
+
 /*
 | -------------------------------------------------------------------
 |  Auto-load Helper Files
@@ -69,7 +91,6 @@
 
 $autoload['helper'] = array('url', 'language');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Config files
@@ -85,7 +106,6 @@
 
 $autoload['config'] = array('application');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Language files
@@ -101,7 +121,6 @@
 
 $autoload['language'] = array();
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Models
@@ -110,10 +129,10 @@
 |
 |	$autoload['model'] = array('model1', 'model2');
 |
+| You can also supply an alternative model name to be assigned
+| in the controller:
+|
+|	$autoload['model'] = array('first_model' => 'first');
 */
 
 $autoload['model'] = array();
-
-
-/* End of file autoload.php */
-/* Location: ./application/config/autoload.php */