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

46 Commits

Author SHA1 Message Date
Stefan Puraner b0c1e50e47 added workaround for parsing data 2016-05-11 11:56:18 +02:00
Stefan Puraner 64a822881a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 08:00:48 +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
Stefan Puraner 4d406ea389 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-10 14:12:54 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
Stefan Puraner 440cac91d6 person model: added method that return list of db columns 2016-05-10 13:46: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 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
Paminger 1a36ce3dff Models 2016-05-04 07:17:07 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +02:00
Paminger 5bd5ac4aad sparch model 2016-05-02 00:37:42 +02:00
Paminger b52ffa8974 OE 2016-05-01 23:34:49 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
paolo 51774021b4 Codeception 2016-04-27 11:46:29 +02:00
paolo 4cc83999ed - Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php 
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
  method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
  method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
  method of the class Studienplan_model
 2016-04-25 18:25:03 +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
paolo f154e6dd5d Check permissions FIX 2016-04-22 16:43:01 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +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 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 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 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 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 19129266b2 RESTv1 2016-03-11 10:08:34 +01:00
Paminger eb84022abf CI Init 2016-02-29 16:51:21 +01:00