Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch cycle: BCrypt, CI 3.1.3 #41

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
# Set default charset
[*]
charset = utf-8

# Tab indentation (no size specified)
indent_style = tab
35 changes: 30 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,40 @@
*.bak
# Ignore vendor -> must generate with composer
vendor

# Ignore uploaded folder -> this folder contains file uploaded by an user
assets/uploaded/*
!assets/uploaded/index.html
!assets/uploaded/.htaccess

# Ignore cache folders
assets/cache/*
!assets/cache/index.html
!assets/cache/.htaccess
application/cache/*
!application/cache/index.html
!application/cache/.htaccess

application/logs/*
!application/logs/index.html
!application/logs/.htaccess
# Thumbnails
._*

application/config/database.php
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.git
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### END SPECIAL MAC ###
application/config/manifest.php
application/config/database.php

# OS generated files #
######################
Expand Down
29 changes: 12 additions & 17 deletions application/config/autoload.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,15 @@
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
|
*/

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


/*
| -------------------------------------------------------------------
| 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 @@ -59,26 +58,29 @@
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/

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


/*
| -------------------------------------------------------------------
| 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');
|
| You can also supply an alternative property name to be assigned in
| the controller:
|
| $autoload['drivers'] = array('cache' => 'cch');
|
*/

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


/*
| -------------------------------------------------------------------
| Auto-load Helper Files
Expand All @@ -87,10 +89,8 @@
|
| $autoload['helper'] = array('url', 'file');
*/

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


/*
| -------------------------------------------------------------------
| Auto-load Config files
Expand All @@ -103,10 +103,8 @@
| config files. Otherwise, leave it blank.
|
*/

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


/*
| -------------------------------------------------------------------
| Auto-load Language files
Expand All @@ -119,10 +117,8 @@
| "codeigniter_lang.php" would be referenced as array('codeigniter');
|
*/

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


/*
| -------------------------------------------------------------------
| Auto-load Models
Expand All @@ -136,5 +132,4 @@
|
| $autoload['model'] = array('first_model' => 'first');
*/

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