blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
This commit is contained in:
paolo
2016-04-27 12:06:59 +02:00
parent 546483bed7 9d2c05bd3d
commit a0c06aa2c3
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/config.php
+1 -1
View File
@@ -514,4 +514,4 @@ spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
require_once $file;
});
});
config/system.config-default.inc.php
+1 -1
View File
@@ -11,7 +11,7 @@
define("DB_SYSTEM","pgsql");
define("DB_HOST","localhost");
define("DB_PORT","5432");
define("DB_NAME","fhcomplete");
define("DB_NAME","fhctest");
define("DB_USER","fhcomplete");
define("DB_PASSWORD","fhcomplete");
define("DB_CONNECT_PERSISTENT",FALSE);
tests/codeception/_data/dump.sql
+1 -1
View File
@@ -219,4 +219,4 @@ DELETE FROM lehre.tbl_studienplan WHERE tbl_studienplan < 5;
INSERT INTO lehre.tbl_studienplan VALUES (1, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (2, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (3, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
tests/codeception/api/v1/PersonCept.php
+1 -1
View File
@@ -33,4 +33,4 @@ $I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
'success' => TRUE,
'message' => 'Person found']);*/
'message' => 'Person found']);*/