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

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
This commit is contained in:
Paminger
2016-05-10 14:36:01 +02:00
parent e624540c16 44ebe15c9c
commit 4b9d5d273b
29 changed files with 631 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/fhcomplete.php
+17
View File
@@ -6,11 +6,28 @@ $config['fhc_version'] = '3.2';
$config['fhc_acl'] = array
(
'bis.tbl_nation' => 'basis/nation',
'bis.tbl_lgartcode' => 'basis/lgartcode',
'campus.tbl_dms' => 'basis/tbl_dms',
'campus.tbl_dms_version' => 'basis/tbl_dms_version',
'lehre.tbl_studienplan' => 'basis/studienplan',
'lehre.tbl_studienordnung' => 'basis/studienordnung',
'lehre.vw_studienplan' => 'basis/vw_studienplan',
'public.tbl_person' => 'basis/person',
'public.tbl_kontakt' => 'basis/kontakt',
'public.tbl_benutzer' => 'basis/benutzer',
'public.tbl_prestudent' => 'basis/person',
'public.tbl_prestudentstatus' => 'basis/person',
'public.tbl_organisationseinheit' => 'basis/organisationseinheit',
<<<<<<< HEAD
'public.tbl_sprache' => 'admin',
'public.tbl_msg_thread' => 'admin',
'public.tbl_msg_message' => 'admin'
);
=======
'public.tbl_sprache' => 'admin'
);
>>>>>>> 44ebe15c9cab8fbbf8396d255648b8afda0f5d14