Skip to content

Commit

Permalink
Merge pull request #34 from sampoyigi/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sampoyigi committed May 18, 2015
2 parents d9e137e + 4a1f4c5 commit cf2a333
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
.DS_Store
.idea

system/tastyigniter/cache/*
!system/tastyigniter/cache/index.html
!system/tastyigniter/cache/.htaccess
main/cache/*
!main/cache/index.html
!main/cache/.htaccess

admin/cache/*
!admin/cache/index.html
!admin/cache/.htaccess

system/tastyigniter/logs/*
!system/tastyigniter/logs/index.html
!system/tastyigniter/logs/.htaccess

assets/images/thumbs/*
!assets/images/thumbs/index.html
Expand Down
4 changes: 3 additions & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
# http://www.example.com/mypage/test1
# then use
# RewriteBase /mypage/test1/
RewriteEngine On

# Turn on URL rewriting
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond $1 !^(index\.php|images|robots\.txt)
Expand Down
2 changes: 1 addition & 1 deletion system/tastyigniter/config/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
*
* NOTE: If you change these, also change the error_reporting() code below
*/
define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'production');

/*
|--------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions system/tastyigniter/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

$db['default']['dsn'] = '';
$db['default']['hostname'] = 'localhost';
$db['default']['username'] = 'workbench';
$db['default']['password'] = '9HPTnqu3pLFchdWd';
$db['default']['database'] = 'tastyigniter_1_3';
$db['default']['username'] = '';
$db['default']['password'] = '';
$db['default']['database'] = '';
$db['default']['dbdriver'] = 'mysqli';
$db['default']['dbprefix'] = 'ti_';
$db['default']['pconnect'] = TRUE;
Expand Down

0 comments on commit cf2a333

Please sign in to comment.