d952087979
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-04-11 09:54:32 +02:00
63a9e99a59
Message-Model conflict
2016-04-11 09:53:58 +02:00
04e2b0dc8b
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-04-11 09:11:37 +02:00
d4a33fc1f9
changed method to post
2016-04-11 08:43:29 +02:00
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
3b39752ab7
Acceptance Tests
2016-04-10 18:11:09 +02:00
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
5b3d3c401d
Merge
2016-04-08 06:45:35 +02:00
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
bcfae6b009
Shit
2016-04-07 15:17:26 +02:00
97ddc838a8
added Kontakt Model; extended Person Model
2016-04-06 15:46:01 +02:00
30a9e9882e
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-04-05 11:41:52 +02:00
bc427f7d2b
fixed config bugs in rest client
2016-04-05 11:35:06 +02:00
c124348484
Message
2016-04-05 09:36:24 +02:00
0c3c47f848
BaseControllerConcept into config.php
2016-03-15 08:14:05 +01:00
d28f79e855
FHC ACL
2016-03-14 07:10:51 +01:00
19129266b2
RESTv1
2016-03-11 10:08:34 +01:00
eb84022abf
CI Init
2016-02-29 16:51:21 +01:00
root