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

95 Commits

Author SHA1 Message Date
Stefan Puraner 0f3e299cf4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 10:24:50 +02:00
paolo de9e92e3b0 - Added permissions for every DB tables that has a model 
- Added all controllers for every model
- All controller has a load and a insert/update method
 2016-05-13 19:00:40 +02:00
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
Stefan Puraner b523a68fdc Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 10:21:07 +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
Stefan Puraner ae80f2f1e9 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 09:07:04 +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
Stefan Puraner bf4da6f43b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 11:58:09 +02:00
Stefan Puraner b0c1e50e47 added workaround for parsing data 2016-05-11 11:56:18 +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
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 4b1691361b Merge 2016-05-10 14:37:13 +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 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
Paminger 1a36ce3dff Models 2016-05-04 07:17:07 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
Paminger a932cfd0ad Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 16:07:49 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +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
Paminger 5bd5ac4aad sparch model 2016-05-02 00:37:42 +02:00
Paminger a6d708a763 PG-Array 2016-05-02 00:36:59 +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 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