blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,093 Commits 225 Branches 6 Tags
aaef564d522f10d92e4b0831b4e36e5817cb3c71
Commit Graph

14 Commits

Author SHA1 Message Date
root ca83b2f59d phrases system 2016-06-21 16:25:55 +02:00
paolo f76b83ef64 - Fixed include of ci_db_extra.php in ci_hack.php 
- Added delete for table public.tbl_preinteressent in dump.sql
 2016-05-12 16:55:21 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo 78e4c2900b Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
 2016-04-20 17:57:55 +02:00
Paminger bf0a96f21a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
 2016-04-10 18:20:43 +02:00
Paminger 3b39752ab7 Acceptance Tests 2016-04-10 18:11:09 +02:00
paolo 1131bff3ec Changes: 
application/controllers/api/v1/Person.php
	Fixed conflicts

application/models/person/Person_model.php
	Fixed conflicts

ci_hack.php
	Load the language class otherwise some VileSci functionalities would crash
	Ex: Personen -> Zusammenlegen

tests/codesniffer/FHComplete/ruleset.xml
	Turned off ParamCommentFullStop option
 2016-04-08 16:53:52 +02:00
Paminger 34db90ba19 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/config/autoload.php
	application/controllers/api/v1/Person.php
	application/models/person/Person_model.php
 2016-04-07 15:20:08 +02:00
Paminger bcfae6b009 Shit 2016-04-07 15:17:26 +02:00
Stefan Puraner bc427f7d2b fixed config bugs in rest client 2016-04-05 11:35:06 +02:00
Paminger c124348484 Message 2016-04-05 09:36:24 +02:00
Paminger 0c3c47f848 BaseControllerConcept into config.php 2016-03-15 08:14:05 +01:00
Paminger eb84022abf CI Init 2016-02-29 16:51:21 +01:00