blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-11 00:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,713 Commits 225 Branches 6 Tags
3b2ead0aaa83158c2b1d0ea7eaaae310ba5bfa90
Commit Graph

60 Commits

Author SHA1 Message Date
paolo a0c06aa2c3 Merge origin/ci into ci 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
 2016-04-27 12:06:59 +02:00
paolo 546483bed7 Merging time 2016-04-27 12:04:42 +02:00
paolo 549b0133c2 Merge origin/ci into ci 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
 2016-04-27 11:54:20 +02:00
paolo 51774021b4 Codeception 2016-04-27 11:46:29 +02:00
Paminger 5ab6a35372 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/config/config.php
 2016-04-26 14:54:45 +02:00
Paminger 4799ec68de Autoload 2016-04-26 14:50:00 +02:00
paolo 932d48d95b FIXed Autoload function using spl_autoload_register 2016-04-26 14:04:10 +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
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +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 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 f12ce76194 Merging 2016-04-15 15:47:56 +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
paolo 64de1ed4f4 HTTP digest authentication 2016-04-13 16:59:51 +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
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