Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Button Generate password and chackbox show/hide password #1249

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
df260ac
Prep develop for 0.9+
mwhitneysdsu Aug 5, 2015
ea5a0a1
Change minimum PHP version in develop (v0.9+)
mwhitneysdsu Aug 5, 2015
3f2849c
MY_*_helper files can now override BF_*_helper files
mwhitneysdsu Aug 6, 2015
f40e435
Remove CI2 directory from Bonfire 0.9+
mwhitneysdsu Aug 6, 2015
ee62fb6
Remove some CI2 compatibility methods/checks
mwhitneysdsu Aug 6, 2015
4bbe737
[Installer] Set Minimum PHP Version 5.4
mwhitneysdsu Aug 6, 2015
bc9d797
Remove CI2 compatibility checks (substr(CI_VERSION, 0, 1) != '2')
mwhitneysdsu Aug 6, 2015
29224d0
Separated abstract Migration class from library file
mwhitneysdsu Aug 7, 2015
aec9126
Removed deprecated `module_*` functions from `application_helper`
mwhitneysdsu Aug 7, 2015
20aac79
Add `application_helper` to upgrade instructions
mwhitneysdsu Aug 7, 2015
5a37ddc
Removed `BF_Model->set_soft_deletes()`, docs updates
mwhitneysdsu Aug 7, 2015
d43e280
Removed `form_has_error()` from `BF_form_helper`
mwhitneysdsu Aug 7, 2015
f11dec5
Removed `Assets::set_globals()`
mwhitneysdsu Aug 7, 2015
42ca9cc
Removed `CommonMark->parse()`
mwhitneysdsu Aug 7, 2015
7f4c05a
Removed `Form::prep_value()`
mwhitneysdsu Aug 7, 2015
9260398
Removed `Installer_lib->mysql_client_version` and `->mysql_server_ver…
mwhitneysdsu Aug 7, 2015
4792459
Removed `Template::$ignore_session` and `Template::$layout`
mwhitneysdsu Aug 7, 2015
8fb3cef
Removed Modulebuilder->build_files() and ->mkdir_recursive()
mwhitneysdsu Aug 7, 2015
58e2bc4
Removed `tr_*` entries from translate language files
mwhitneysdsu Aug 7, 2015
80f227b
Removed `render_search_box()` from `ui_helper`
mwhitneysdsu Aug 7, 2015
b437864
Removed `Contexts::get_contexts()` and `Contexts::set_contexts()`
mwhitneysdsu Aug 7, 2015
e2c4685
Removed `abbrev_name()` helper function from `Auth` library
mwhitneysdsu Aug 7, 2015
2e884ba
Remove use of deprecated `router->fetch_method()`
mwhitneysdsu Aug 7, 2015
b322fb1
Upgrade CodeIgniter to 3.0.1
mwhitneysdsu Aug 7, 2015
4243909
Updated CLI error templates from CI 3.0.1
mwhitneysdsu Aug 10, 2015
94067d4
Config updates for CI 3.0.1 + removal of CI2 compatibility
mwhitneysdsu Aug 10, 2015
d79d098
Fix #1153 "Undefined index: user_agent" Update MX_Loader
mwhitneysdsu Aug 11, 2015
f50e7ff
Remove loading of Composer from App_hooks
mwhitneysdsu Aug 11, 2015
b70c39d
Remove CI2 compatibility from Base_Controller
mwhitneysdsu Aug 11, 2015
84c4ac1
Remove is_https() from application_helper (defined in CI3's core/Comm…
mwhitneysdsu Aug 11, 2015
0d141fc
Remove CI2 back-port of timezone_menu() from BF_date_helper
mwhitneysdsu Aug 11, 2015
0f0af26
BF_Model cleanup
mwhitneysdsu Aug 13, 2015
d18311b
BF_Loader cosmetic changes
mwhitneysdsu Aug 13, 2015
355caef
BF_Lang: make `$langfile` parameter of `load()` non-optional
mwhitneysdsu Aug 13, 2015
90f52d4
BF_Security: Add 403 status code to `csrf_show_error()`
mwhitneysdsu Aug 13, 2015
8ab7d06
BF_Router: Removed CI2 compatibility
mwhitneysdsu Aug 13, 2015
5ec23fc
Configurable logging of bad password and banned user login attempts
mwhitneysdsu Aug 13, 2015
9719a1e
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Aug 14, 2015
5e0ffe3
Remove PHP_VERSION >= 5.3 check from public/index.php
mwhitneysdsu Aug 17, 2015
fd4fdb5
users/user_meta view PHP 7 compatibility improvements
mwhitneysdsu Aug 18, 2015
4834967
Upgraded CSSMin to 3.0.3 https://github.com/natxet/CssMin
mwhitneysdsu Aug 18, 2015
2f4fadc
Upgraded JSMin to 1.1.2 https://github.com/rgrove/jsmin-php
mwhitneysdsu Aug 18, 2015
73ce893
Upgraded/deprecated markdown_helper and markdown_extended_helper
mwhitneysdsu Aug 18, 2015
64b8d82
Changed controller name string case
jubayerarefin Aug 19, 2015
8e3d336
Merge pull request #1155 from dipu/controller-name-case-fix-in-codebu…
mwhitneysdsu Aug 19, 2015
d38e805
Docs updates for #1154 and #1155
mwhitneysdsu Aug 19, 2015
0c1cbd1
Docs updates, deprecated Contexts::build_sub_menu()
mwhitneysdsu Aug 21, 2015
6098aeb
Update README.markdown
mwhitneysdsu Aug 21, 2015
66f2b2e
Updated Wiredesignz HMVC with latest commits through 2015-08-14
mwhitneysdsu Aug 25, 2015
a31a61b
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Sep 8, 2015
7113d82
Reduce direct calls to $this->db, see #1160
mwhitneysdsu Sep 9, 2015
9d94e9f
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Sep 24, 2015
4d40131
Upgrade CodeIgniter to 3.0.2
mwhitneysdsu Oct 8, 2015
70461bf
Updated constants config to check whether constants are defined
mwhitneysdsu Oct 8, 2015
7fbb8f4
Changes from #1164 submitted by @JbalTero
mwhitneysdsu Oct 16, 2015
eccde2a
Update docs for #1164
mwhitneysdsu Oct 16, 2015
5be9d72
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Nov 2, 2015
b8c3ad5
Update CodeIgniter to 3.0.3
mwhitneysdsu Nov 2, 2015
37419c2
Merge changes from 0.8-dev
mwhitneysdsu Nov 6, 2015
9f6bbbb
Fix #1174 Clarify difference between Site Email and System Email
mwhitneysdsu Nov 10, 2015
daeb35b
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Nov 12, 2015
e242aaa
Update blog tutorial to capitalise Classes
silverark Nov 18, 2015
58481da
Merge pull request #1184 from silverark/patch-1
lonnieezell Nov 18, 2015
3b8db28
Add New Zealand regions
boblennes Nov 30, 2015
b54f6b6
Merge pull request #1191 from boblennes/patch-1
mwhitneysdsu Nov 30, 2015
1924b29
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Dec 14, 2015
4d0f9eb
Fix constants config (from CI PR)
mwhitneysdsu Jan 13, 2016
ba3745d
Update changelog for 4d0f9ebda757152f5f76857cfd588c94e2f7063d
mwhitneysdsu Jan 13, 2016
b7132de
Merge branch 'develop' of https://github.com/ci-bonfire/Bonfire into …
Jan 20, 2016
21b28e1
Fix #1209 incorrect error message when deactivating user(s)
mwhitneysdsu Jan 25, 2016
f5cec93
Merge remote-tracking branch 'ci-bonfire/develop' into develop
Jan 26, 2016
4aae4ed
Fix #1216 Assets::add_css() adds media CSS file
mwhitneysdsu Feb 25, 2016
209edab
Fix issue #1213
s4ad Mar 4, 2016
d744167
Merge pull request #1219 from s4ad/develop
mwhitneysdsu Mar 10, 2016
f4a3ea3
Fix #1222 error when running migration 18
mwhitneysdsu Apr 4, 2016
3e7b9be
Fix #1225 add_module_css() adding files twice
mwhitneysdsu Apr 4, 2016
17d6718
Fix #1193 Assets Library handling of filenames
mwhitneysdsu May 17, 2016
9bf84d1
Upgrade CI to 3.0.6
mwhitneysdsu May 17, 2016
2f06e68
Updated Assets.php: Add bypassInheritance support to external_js() me…
FlorinMotoc Aug 19, 2016
1f066aa
Updated Assets.php: Add $cached support to module_js()
FlorinMotoc Aug 19, 2016
4edf6d8
Merge pull request #1243 from FlorinMotoc/patch-2
lonnieezell Aug 19, 2016
c7073c8
Merge pull request #1242 from FlorinMotoc/patch-1
lonnieezell Aug 19, 2016
7d18936
Spanish Lang - Fix
Sep 4, 2016
318420c
Initial upgrade to CI 3.13
lonnieezell Jan 24, 2017
0b7fc4a
Updates to CI core files to get Bonfire working again.
lonnieezell Jan 24, 2017
65a942a
Merge branch 'origin-develop' into develop
Apr 3, 2017
c341a1d
- Fix new core won't load Bonfire controllers
Apr 3, 2017
1d17ef3
Merge pull request #1261 from lesydat/develop
lonnieezell Apr 3, 2017
4bfed56
Adding install note about base_url
lonnieezell Apr 11, 2017
2ed2391
Update Developer.php
PeterRock May 6, 2017
d3a7f9a
Merge pull request #1265 from PeterRock/patch-1
lonnieezell May 8, 2017
2a3da6c
Update config_file_helper.php
PeterRock May 9, 2017
437bc9a
Merge pull request #1266 from PeterRock/patch-2
lonnieezell May 9, 2017
e70d588
Update Markdown helpers constructor
DocKob Jun 2, 2017
a997351
Merge pull request #1270 from davex47/develop
lonnieezell Jun 2, 2017
16956df
Add multi languages support for module description on context menu
lesydat Jun 27, 2017
566e28b
Merge pull request #1276 from lesydat/patch
lonnieezell Jun 30, 2017
e0916c2
Assets: Generate different combined filenames for different included …
zoliszabo Jul 26, 2017
26ce65a
Merge pull request #1278 from zoliszabo/develop
lonnieezell Jul 29, 2017
9dba8f1
CI3 Lib updates & Fixes 3.1.5
Reconix Sep 19, 2017
da5f9a9
CI3 Helpers Update & Fixes 3.1.5
Reconix Sep 19, 2017
51b0140
CI3 DB Updates & Fixes 3.1.5
Reconix Sep 19, 2017
223c0a1
CI3 core Updates & Fixes 3.1.5
Reconix Sep 20, 2017
bd46112
Merge pull request #1283 from Reconix/develop
lonnieezell Sep 20, 2017
e52f6a3
CI3 Updates & Fixes 3.1.6
Reconix Sep 27, 2017
6a9df1a
Merge pull request #1284 from Reconix/develop
lonnieezell Sep 28, 2017
7ba0841
CI 3.1.6 core updated to support Bonfire classes. Fixes #1260
lonnieezell Sep 28, 2017
8e44a10
Merge pull request #1248 from TowerX/patch-1
lonnieezell Sep 28, 2017
54f1dda
Updating copyright dates
lonnieezell Jan 31, 2018
3a2b221
CI3 core Updates & Fixes 3.1.9
Reconix Jul 13, 2018
154aa0d
Merge pull request #1300 from Reconix/develop
lonnieezell Jul 13, 2018
95efd56
Update CSSmin to v3.0.6
Reconix Dec 17, 2019
3eaf6f8
Merge pull request #1322 from Reconix/patch-1
lonnieezell Dec 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 9 additions & 6 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ All wrapped up in an elegant interface that will make you proud when you hand th

## Current Features

- CodeIgniter 3.x included. CodeIgniter 2.x support available with [some minor changes](https://github.com/ci-bonfire/Bonfire/blob/develop/bonfire/docs/ci2.md).
- CodeIgniter 3.x included.
- Very flexible template/theme system, capable of Wordpress-like parent/child themes.
- Uses Twitter Bootstrap 2.x for the Admin and Default themes
- Fully modular and built around HMVC
Expand Down Expand Up @@ -43,15 +43,18 @@ Let's make this the best kick-start to any CodeIgniter project.

### Branches

Due to the shift from CI2 to CI3, there are 2 branches containing recent releases and 2 development branches.
Due to the shift from CI2 to CI3, there are 2 branches containing recent releases and 3 development branches.

- The releases are in the master (v0.8.x) and 0.7.x (v0.7.x) branches.
- The development branches are develop (v0.8.x) and 0.7-dev (v0.7.x) branches.
- The releases are in the 0.8.x (v0.8.x) and 0.7.x (v0.7.x) branches.
- The development branches are develop (v0.9+), 0.8-dev (v0.8.x), and 0.7-dev (v0.7.x).

Any changes due to issues in the Bonfire code are currently being made to both development branches.
Bug fixes are currently being made to all three development branches, but 0.7-dev and 0.8-dev are now bugfix-only branches.

- v0.8.x uses CodeIgniter 3 by default. CI2 is supported, but not included.
- v0.7.x uses CodeIgniter 2 by default. CI3 is supported, but not included.
- v0.8.x uses CodeIgniter 3 by default. CI2 is supported, but not included.
- v0.9+ uses CodeIgniter 3, and will not continue to support CI2.

The develop branch will be the only branch receiving new features and/or major code changes.

## Bug Reports

Expand Down
19 changes: 19 additions & 0 deletions application/config/address.php
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,25 @@
'YU' => 'Yucatan',
'ZA' => 'Zacatecas',
),
'NZ' => array(
'E7' => 'Auckland',
'E8' => 'Bay of Plenty',
'E9' => 'Canterbury',
'10' => 'Chatham Islands',
'F1' => 'Gisborne',
'F2' => "Hawke's Bay",
'F3' => 'Manawatu-Wanganui',
'F4' => 'Marlborough',
'F5' => 'Nelson',
'F6' => 'Northland',
'F7' => 'Otago',
'F8' => 'Southland',
'F9' => 'Taranaki',
'TAS' => 'Tasman',
'G1' => 'Waikato',
'G2' => 'Wellington',
'G3' => 'West Coast'
),
'US' => array(
'AK' => 'Alaska',
'AL' => 'Alabama',
Expand Down
44 changes: 14 additions & 30 deletions application/config/application.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?php defined('BASEPATH') || exit('No direct script access allowed');

$config['bonfire.installed'] = "1";
/**
* Bonfire
*
* An open source project to allow developers to jumpstart their development of
* CodeIgniter applications
* CodeIgniter applications.
*
* @package Bonfire
* @author Bonfire Dev Team
* @copyright Copyright (c) 2011 - 2014, Bonfire Dev Team
* @copyright Copyright (c) 2011 - 2018, Bonfire Dev Team
* @license http://opensource.org/licenses/MIT The MIT License
* @link http://cibonfire.com
* @since Version 1.0
Expand All @@ -19,16 +21,15 @@
*/
$config['site.default_user_timezone'] = 'UM8';

//--------------------------------------------------------------------
//------------------------------------------------------------------------------
// Module Locations
//--------------------------------------------------------------------
// These paths are checked in the order listed whenever a module is
// attempting to be located, whether it's loading a library, helper,
// or routes file.
//------------------------------------------------------------------------------
// These paths are checked in the order listed when attempting to locate a module,
// whether loading a library, helper, or routes file.
//
$config['modules_locations'] = array(
realpath(APPPATH) . '/modules/' => '../../application/modules/',
realpath(APPPATH . '../bonfire') . '/modules/' => '../../bonfire/modules/',
realpath(BFPATH) . '/modules/' => '../../bonfire/modules/',
);

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -215,31 +216,14 @@
$config['assets.encode'] = false;

//------------------------------------------------------------------------------
// Deprecated assets config items
// (Use 'assets.directories' instead)
// Auth
//------------------------------------------------------------------------------

// The base folder (relative to the template.site_root config setting) that all
// of the assets are stored in. This is used to generate both the url and the
// relative file path.
// This should NOT include the trailing slash.
$config['assets.base_folder'] = 'assets';
// If 'auth.log_failed_login_activity' is set to true, entries will be added to
// the activity logs whenever someone attempts to login with a bad password or a
// banned account.
$config['auth.log_failed_login_activity'] = false;

// The names of the folders for the various assets.
// These default to 'js', 'css', and 'images'.
// These folders are expected to be found directly under the
// 'assets.base_folder'.
// While searching through themes, these names are also used to build alternate
// folders to look into, under the theme folders.
$config['assets.asset_folders'] = array(
'css' => 'css',
'js' => 'js',
'image' => 'images'
);

//------------------------------------------------------------------------------
// End deprecated assets config items
//------------------------------------------------------------------------------

//------------------------------------------------------------------------------
// !Shortcut Keys
Expand Down
29 changes: 15 additions & 14 deletions application/config/autoload.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('BASEPATH') || exit('No direct script access allowed');
defined('BASEPATH') OR exit('No direct script access allowed');

/*
| -------------------------------------------------------------------
Expand Down Expand Up @@ -39,7 +39,6 @@
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
|
*/

$autoload['packages'] = array(
realpath(APPPATH .'../bonfire'), // Bonfire Core
APPPATH . 'third_party', // App -specific 3rd-party libs.
Expand All @@ -49,8 +48,9 @@
| -------------------------------------------------------------------
| Auto-load Libraries
| -------------------------------------------------------------------
| These are the classes located in the system/libraries folder
| or in your application/libraries folder.
| These are the classes located in system/libraries/ or your
| application/libraries/ directory, with the addition of the
| 'database' library, which is somewhat of a special case.
|
| Prototype:
|
Expand All @@ -61,23 +61,28 @@
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/

$autoload['libraries'] = array('database');


/*
| -------------------------------------------------------------------
| Auto-load Drivers
| -------------------------------------------------------------------
| These classes are located in the system/libraries folder or in your
| application/libraries folder within their own subdirectory. They
| These classes are located in system/libraries/ or in your
| application/libraries/ directory, but are also placed inside their
| own subdirectory and they extend the CI_Driver_Library class. They
| offer multiple interchangeable driver options.
|
| Prototype:
|
| $autoload['drivers'] = array('cache');
| $autoload['drivers'] = ['cache'];
|
| You can also supply an alternative property name to be assigned in
| the controller:
|
| $autoload['drivers'] = array('cache' => 'cch');
|
*/

$autoload['drivers'] = array();

/*
Expand All @@ -88,7 +93,6 @@
|
| $autoload['helper'] = array('url', 'file');
*/

$autoload['helper'] = array('url', 'language');

/*
Expand All @@ -103,7 +107,6 @@
| config files. Otherwise, leave it blank.
|
*/

$autoload['config'] = array('application');

/*
Expand All @@ -118,7 +121,6 @@
| "codeigniter_lang.php" would be referenced as array('codeigniter');
|
*/

$autoload['language'] = array();

/*
Expand All @@ -127,12 +129,11 @@
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['model'] = array('model1', 'model2');
| $autoload['model'] = array('first_model', 'second_model');
|
| You can also supply an alternative model name to be assigned
| in the controller:
|
| $autoload['model'] = array('first_model' => 'first');
*/

$autoload['model'] = array();
Loading