Commit Graph

8334 Commits

Author SHA1 Message Date
Stefan Puraner b07beff444 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 15:05:59 +02:00
Stefan Puraner fec722a481 fixed missing else clause 2016-05-23 15:03:44 +02:00
kindlm d899ccad08 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:25:14 +02:00
kindlm 4bff558c1f Versehentlich eingecheckt 2016-05-23 12:22:22 +02:00
kindlm abae24b0aa Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:07:34 +02:00
kindlm fc932b464d SQL in function getStudienplaeneFromSem adaptiert 2016-05-23 11:49:57 +02:00
kindlm 029395372b Add Param $studiensemester_kurzbz in function getAllForBewerbung 2016-05-23 11:49:21 +02:00
nscbrandb 42d0ef79fd undoing ci_hack.php 2016-05-23 11:44:03 +02:00
nscbrandb 419ca7ac46 Merge branch 'ci' of https://github.com/nscbrandb/FHC-Core into ci
Conflicts:
	ci_hack.php
2016-05-23 11:35:23 +02:00
paolo 489848c629 Merge origin/ci into ci 2016-05-23 10:32:50 +02:00
paolo a34f82fd3c - Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
2016-05-23 10:32:21 +02:00
nscbrandb 3bf093fd2c Fix 2016-05-23 09:44:01 +02:00
Gerald Raab b231caca13 ital 2016-05-22 00:19:02 +02:00
Gerald Raab 80021520ce Ital phrase 2016-05-22 00:06:25 +02:00
Stefan Puraner cf272c0e40 added method to parse post data 2016-05-20 17:34:22 +02:00
Stefan Puraner dfea2bab26 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 16:11:56 +02:00
oesi 0e3cd3a54d Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-20 14:59:47 +02:00
oesi 3997dd55ce Fehler behoben bei der Anzeige der Dokumente im Bewerbertool 2016-05-20 14:54:29 +02:00
paolo 606bd3d342 Added method PrestudentByPersonID to Prestudent controller 2016-05-20 14:07:31 +02:00
Gerald Raab 103f3f10af New Template for Milano 2016-05-20 13:44:58 +02:00
paolo 3e6ac6987e Merge origin/ci into ci 2016-05-20 13:04:41 +02:00
paolo 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +02:00
Paminger e441886748 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 12:21:45 +02:00
Paminger f3a49e09e7 Demo 2016-05-20 12:21:04 +02:00
paolo cd10d96c91 - Added permissions and linked them to user admin in dump.sql
- Modified validate methods to public for classes benutzer, student and mitarbeiter
2016-05-20 12:09:18 +02:00
Gerald Raab f5f56056ca Ital. phrase 2016-05-20 11:28:02 +02:00
Stefan Puraner da8f7251e0 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 11:22:23 +02:00
paolo e5554ad1ba Merge origin/ci into ci 2016-05-20 11:05:12 +02:00
paolo ffac4458ef Added permissions for user amdin in the DB 2016-05-20 11:04:51 +02:00
Paminger ffac73c447 GitIgnore 2016-05-20 11:03:45 +02:00
paolo 3c6638fac6 Added permissions for user amdin in the DB 2016-05-20 11:01:52 +02:00
Paminger d4994c95e9 New Build Folder 2016-05-20 10:38:28 +02:00
Paminger bf1a16427c PHPCI 2016-05-20 10:33:19 +02:00
Gerald Raab da7036d33a Bugfix ExamReg, Geburtsort instudent xml, Hide Moodle-Icon if not used 2016-05-20 10:25:32 +02:00
Paminger 815d34ebb6 PHPCI 2016-05-20 10:25:10 +02:00
Stefan Puraner 9a4c03fd45 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 09:56:27 +02:00
Paminger 42e911b4fe CodeSniffer 2016-05-20 07:44:08 +02:00
paolo 39cbed0ca8 Added directory education and its relative controllers 2016-05-19 19:04:45 +02:00
paolo 32acc8a414 Fixed controllers parameters names and number 2016-05-19 15:51:15 +02:00
paolo 674e832392 disContinuous disIntegration 2016-05-18 16:09:47 +02:00
Stefan Puraner 9cf11673ae Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 15:41:33 +02:00
paolo e88da56dd7 Added method PreinteressentByPersonID to Preinteressent controller 2016-05-18 15:26:37 +02:00
oesi 5f540c2067 Plugin für Moodle 3.0 2016-05-18 15:03:38 +02:00
Stefan Puraner 01f73e5d57 bugfix bei noten von kompatiblen faechern 2016-05-18 13:20:16 +02:00
paolo a95d1f634b Fixed permission for lehre.vw_studienplan 2016-05-18 12:03:07 +02:00
paolo 5d7d79b086 - Renamed every controller that has conflicts with class name
- Added routes to renamed controllers
 - Fixed controllers parameters in get method
2016-05-18 11:24:10 +02:00
Stefan Puraner 0f3e299cf4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 10:24:50 +02:00
nscbrandb e34bda9649 Composer Merge-Plugin für AddOn-spezifische composer.json's 2016-05-17 15:47:33 +02:00
oesi 978ce062a2 Problem beim Download behoben wenn keine APZ eingetragen ist 2016-05-17 14:18:12 +02:00
oesi 15345588ad E-Mailversand bei Reihungstests berücksichtigt das EMAIL-Adresstrennzeichen aus dem Config 2016-05-17 13:30:57 +02:00