Commit Graph

43 Commits

Author SHA1 Message Date
paolo d48f586af2 - Added new permission to access to tbl_preinteressent table using basis/preinteressent
- Added controller Preinteressent with method to read/write from/in the DB
2016-05-12 13:54:31 +02:00
paolo 63db2326ed - Added new permission to access to tbl_studiengang table using basis/studiengang
- Added method getStudiengang to class Studiengang2 to get a studiengang from pk
- Added method addDistinct to class DB_Model to add the distinct clause to a query
2016-05-12 10:05:29 +02:00
paolo 0132356094 - Added new permission to access to tbl_addresse table using basis/adresse
- Added adresse controller and model
2016-05-11 15:12:35 +02:00
paolo 4413a64860 - Added new permission to access to tbl_bundesland table using basis/nation
- Added bundesland controller and model
2016-05-11 10:40:08 +02:00
paolo 9168479912 - Moved class Studiengang to Studiengang2 to prevent class name conflicts
- Added a route rule to let to call Studiengang2 controller with the urn /api/v1/organisation/studiengang/
 - Moved Kontank controller to /api/v1/person
 - Kontakt controller has two method getKontakt and postKontakt
2016-05-10 15:30:00 +02:00
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
2016-05-10 14:36:01 +02:00
paolo 44ebe15c9c - Method getCheckBewerbung implemented with new standard
- Added new permission in fhcomplete.php config file
2016-05-10 13:05:02 +02:00
paolo 6d093dc4ed - DB_Model added new functionalities
- Codeception changed
 - Studiengang_model fixed message error
 - Removed File and File_model, they will be replaced by Dms and Dms_model
 - Added new permissions in fhcomplete config file
2016-05-09 18:19:58 +02:00
paolo 28e1707b4e Change paths 2016-05-04 16:20:26 +02:00
paolo 85f3ea1dab Moving 2016-05-04 15:43:40 +02:00
paolo 030fe2ba74 Merge origin/ci into ci
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
2016-05-04 15:34:00 +02:00
paolo 53eab958dd New structure for CI controllers and models 2016-05-04 15:19:11 +02:00
Stefan Puraner d06a7acdc3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 13:00:58 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +02:00
paolo 346b8c82e1 JSON output improved 2016-04-22 11:08:38 +02:00
paolo 75e3590a09 This is not the best code in the world, it's only a beta version 2016-04-21 17:17:30 +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
paolo 0ffe7fbcc6 Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-18 09:03:15 +02:00
paolo 9aef5dcc30 HTTP basic authentication
Set this as default authentication, providing codeception test case
2016-04-15 15:41:38 +02:00
paolo aec2e7b5ac HTTP digest authentication
The digest http authentication does not allow to use a password storing
systems, that do not successively allow to retrieve it, even if hashed
2016-04-14 15:24:53 +02:00
Stefan Puraner cc88d3b5d5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-13 13:09:57 +02:00
Paminger 5bfe253942 CS 2016-04-13 10:59:51 +02:00
root a13b51e02c Tests 2016-04-13 08:41:09 +02:00
Paminger 4b5211a9c6 FHC_Auth 2016-04-13 07:49:01 +02:00
Stefan Puraner 0597a5d9aa excluded api methods from auth 2016-04-12 15:16:33 +02:00
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 df889c235b BugFix 2016-04-11 14:20:33 +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
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 97ddc838a8 added Kontakt Model; extended Person Model 2016-04-06 15:46:01 +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 19129266b2 RESTv1 2016-03-11 10:08:34 +01:00