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

Frontend User Authentication Fixed #130

Open
wants to merge 4 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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## CodeIgniter 3 Bootstrap

<<<<<<< HEAD
**Latest Build: 2018-04-24**
=======
**Latest Build: 2017-03-24**
>>>>>>> 8ce330c850f45d948fbc987b423ccb72ec6ad96a

**Note: This project is still in progress, but welcome for any issues encountered**

Expand Down
4 changes: 2 additions & 2 deletions application/config/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
define('API_HOST', $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
}

define('CI_BOOTSTRAP_REPO', 'https://github.com/waifung0207/ci_bootstrap_3');
define('CI_BOOTSTRAP_VERSION', 'Build 20170324'); // will follow semantic version (e.g. v1.x.x) after first stable launch
define('CI_BOOTSTRAP_REPO', 'https://github.com/mhamzas/ci_bootstrap_3');
define('CI_BOOTSTRAP_VERSION', 'Build 20180424'); // will follow semantic version (e.g. v1.x.x) after first stable launch

// Upload paths
//define('UPLOAD_COVER_PHOTO', 'assets/uploads/cover_photos');
Empty file modified application/config/testing/database.php
100755 → 100644
Empty file.
Loading