Commit Graph

16 Commits

Author SHA1 Message Date
paolo 7032d8be7f Authentication working with LDAP 2016-04-11 17:23:51 +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 97ddc838a8 added Kontakt Model; extended Person Model 2016-04-06 15:46:01 +02:00
Stefan Puraner 30a9e9882e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-05 11:41:52 +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 9689fd5a01 PHPCI 2016-03-20 12:53:17 +01:00
Paminger 0c3c47f848 BaseControllerConcept into config.php 2016-03-15 08:14:05 +01:00
Paminger f4aa42caa1 RestAuth 2016-03-12 07:12:46 +01:00
Paminger 7ac944ec28 Language 2016-03-11 10:12:15 +01:00
Paminger 19129266b2 RESTv1 2016-03-11 10:08:34 +01:00
Stefan Puraner 24756d9cf3 added port to db connection of codeigniter 2016-03-10 10:46:40 +01:00
Paminger 2355facd39 VilesciFrameset 2016-03-01 08:13:14 +01:00
Paminger 642ba3a2dc BugFix 2016-02-29 17:02:19 +01:00
Paminger eb84022abf CI Init 2016-02-29 16:51:21 +01:00