blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-10 00:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,836 Commits 224 Branches 6 Tags
fbd4ded720b339cc29d3900a6741bc21d87cd721
Commit Graph

1586 Commits

Author SHA1 Message Date
paolo d689953b83 Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/controllers/api/v1/APIAuth.php
 2016-04-11 17:35:14 +02:00
paolo 7032d8be7f Authentication working with LDAP 2016-04-11 17:23:51 +02:00
Paminger 4e2e943ae2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 14:20:44 +02:00
Paminger df889c235b BugFix 2016-04-11 14:20:33 +02:00
Stefan Puraner a6031bbe2e merging message model 2016-04-11 10:05:19 +02:00
root d952087979 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:54:32 +02:00
root 63a9e99a59 Message-Model conflict 2016-04-11 09:53:58 +02:00
Stefan Puraner 04e2b0dc8b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:11:37 +02:00
Stefan Puraner d4a33fc1f9 changed method to post 2016-04-11 08:43:29 +02:00
Paminger ae1dc93a14 API-Struktur und CodeSniffer Verbesserungen 2016-04-11 08:11:15 +02:00
Paminger 1f236b4b5a CodeCeption 2016-04-11 07:08:46 +02:00
Paminger 20ea242f35 Move Kontakt-Controller to person folder 2016-04-11 06:40:37 +02:00
Paminger 27af06cbb0 CodeSniffer 2016-04-10 21:43:45 +02:00
Paminger 705ee7c62c BugFix Migration 2016-04-10 19:46:35 +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 5b3d3c401d Merge 2016-04-08 06:45:35 +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 3c1bcfa999 BugFix 2016-03-21 07:26:19 +01: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 d28f79e855 FHC ACL 2016-03-14 07:10:51 +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 1a1776ca2a Libraries 2016-03-11 10:09:14 +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