blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,006 Commits 217 Branches 6 Tags
6dc145d618fcffbee58da96bbe7778506ab823cd
Commit Graph
7006 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
paolo 4146257917 Wrong .gitignore 2016-04-27 13:42:54 +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 9d2c05bd3d PHPCI-Install 2016-04-27 10:34:49 +02:00
Paminger 70a3c43f7c PHPCI 2016-04-26 16:39:50 +02:00
Paminger 39f65875c6 PersonCept 2016-04-26 15:23:21 +02:00
Paminger fe227ebdcb Cepts 2016-04-26 15:03:09 +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 d93dd1fb94 FIXed AddonAuthentication file inclusion 2016-04-26 11:14:38 +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
oesi 7bee4b02b7 Aliqoute Reduktion zeigt nun an ob ein Interviewbogen vorhanden/akzeptiert ist 2016-04-25 16:00:48 +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
kindlm 197064d44d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-25 12:23:14 +02:00
kindlm f58ee305dc Added span for Addon lehrmittel/software 2016-04-25 11:38:39 +02:00
kindlm 6940f72d58 Addon-Ability stpl_week.php for lehrmittel/software 2016-04-25 11:37:25 +02:00
kindlm b346bf4dfa PreStudentID for StudentPrintAusbildungsvertrag 
- Function StudentPrintAusbildungsvertrag now uses PrestudentID instead
of UID. So the Ausbildungsvertrag can be printed at any time.
- Text-Changes in Ausbildungsvertrag
 2016-04-25 11:31:15 +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
oesi 521611d671 Wenn keine genehmigte Studienordnung vorhanden ist, werden die alle LVs angezeigt und nur die Module herausgefiltert 2016-04-22 10:20:34 +02:00
oesi e8e3ab76c9 Vorerst werden im CIS nur noch Lehrveranstaltungen angzeigt die in genehmigten Studienplänen vorkommen 2016-04-22 10:01:31 +02:00
paolo 4e02a1105b Fixed wrong path in require statement 2016-04-22 10:00:24 +02:00
oesi 7af312bb8f Neuer Parameter genehmigt um nur Lehrveranstaltungen abfragen zu können die in genehmigten Studienordnungen verwendet werden 2016-04-22 09:19:09 +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
Gerald Raab fbe9c5e9ed ital 2016-04-21 13:06:44 +02:00
Gerald Raab 0d937232a2 ital 2016-04-21 10:19:52 +02:00
Gerald Raab 906a383c30 ital phrases 2016-04-21 10:17:44 +02:00
Gerald Raab 1ffa831887 include generated pruefung.js.php 2016-04-21 09:36:00 +02:00
Gerald Raab 1d879f484a ital phrase 2016-04-21 09:27:43 +02:00
Gerald Raab 4cb468ed2b ital locale 2016-04-21 09:24:37 +02:00
Gerald Raab 9a5ca672f2 ital locale 2016-04-20 18:17:55 +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
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
oesi 07ebcebcf3 Neue Funktion hinzugefügt um zu Prüfen ob eine Lehrveranstaltung zur Bearbeitung gesperrt ist 2016-04-18 15:24:43 +02:00
Nikolaus Krondraf 0292f69d2b Mehrsprachigkeit der Statuswerte 2016-04-18 12:12:04 +02:00
Gerald Raab 825a03adaa Codingstyle 2016-04-18 11:29:15 +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
oesi 87c021b693 Fehler behoben in der Anzeige der Lehrveranstaltungen im FAS wenn mehrere verschiedene Studienordnungen aktiv sind 2016-04-15 09:35:30 +02:00
oesi 3760195a58 Fehler behoben wodurch nicht alle Outgoing im Filter angezeigt wurden wenn diese länger als ein Semester im Ausland sind 2016-04-15 08:38:04 +02:00
Paminger ca65efe967 BugFix 2016-04-14 22:33:57 +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
Gerald Raab 1585f92c64 formatting 2016-04-14 15:15:53 +02:00