Chiefsoft/CoreGrade
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade

Browse Source 
Conflicts:
	www/application/controllers/Auth.php
This commit is contained in:
Toks Law
2020-02-08 00:39:03 -05:00
parent 275e53d319 78381960f4
commit 31a7cb3508
16 changed files with 357 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coregrade/src/include/php_coregrade_api_ns.h
+1 -1
View File
@@ -1 +1 @@
#define COREGRADE_API_NS "coregrade_api_oameye"
#define COREGRADE_API_NS "coregrade_api_tokslaw"
coregrade/src/include/php_coregrade_config.h
+1 -1
View File
@@ -1 +1 @@
#define COREGRADE_CONFIG "/home/oameye/coregrade/coregrade/etc/"
#define COREGRADE_CONFIG "/home/tokslaw/coregrade/coregrade/etc/"
coregrade/src/include/php_coregrade_log.h
+1 -1
View File
@@ -1 +1 @@
#define COREGRADE_LOG "/home/oameye/coregrade/coregrade/logs/coregrade_api.log"
#define COREGRADE_LOG "/home/tokslaw/coregrade/coregrade/logs/coregrade_api.log"
coregrade/src/include/php_tmpl_prefix.h
+1 -1
View File
@@ -1 +1 @@
#define TMPL_PREFIX "/home/oameye/coregrade/coregrade/email/"
#define TMPL_PREFIX "/home/tokslaw/coregrade/coregrade/email/"