Commit Graph

6899 Commits

Author SHA1 Message Date
Andreas Moik bcf57fcbf2 cis/private/profile/studienplan.php added an option to choose between prestudents 2016-06-10 11:51:10 +02:00
Andreas Moik b41122e174 TODO EINE fixes
tbl_pruefung.student_uid TO tbl_pruefung.prestuent_id
2016-06-09 10:01:32 +02:00
Andreas Moik 9d12a47486 multiple TODO EINE comments fixed 2016-06-07 14:07:49 +02:00
Andreas Moik 1c2f8e126f Merge branch 'master' into eine_uid 2016-06-03 12:48:57 +02:00
Andreas Moik b6d9f2a4ce param changes for rdfs 2016-06-03 12:30:53 +02:00
kindlm 73b69d8657 Reverted wrong commit 2016-06-01 17:45:39 +02:00
kindlm 9f109127a5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	cis/private/profile/studienplan.php
#	locale/de-AT/pruefung.php
#	locale/en-US/pruefung.php
#	locale/it-IT/pruefung.php
#	vilesci/lehre/lv_merge.php
2016-06-01 17:09:10 +02:00
kindlm 8c8753b667 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	include/studienplan.class.php
2016-06-01 16:52:57 +02:00
Andreas Moik 4c3d0bf5aa TODO-tags for non-unique student->prestudent_id 2016-06-01 14:37:10 +02:00
oesi b0b3fe845a Aliqoute Reduktion verwendet die MasterZGV bei Masterstudiengängen zur Reihung 2016-06-01 13:55:42 +02:00
Gerald Raab 5b0a843500 ital. phrases 2016-05-30 17:32:50 +02:00
Andreas Moik 3cba596571 student-io-detail-textbox-uid removed
abschlusspruefung.rdf.php chages for eine_uid
2016-05-30 16:34:19 +02:00
oesi f1098055fe Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-30 16:00:58 +02:00
oesi ba9d398b55 Engliche Fehlermeldung bei Fehlerhaftem Login 2016-05-30 16:00:26 +02:00
Andreas Moik 0e0f762fc4 bugfix for bug "L is NULL" 2016-05-30 14:15:10 +02:00
Andreas Moik d136937aa0 pruefungsanmeldung.json.php changed for eine_uid 2016-05-30 14:03:13 +02:00
Gerald Raab 01143cd51d it phrase 2016-05-26 22:17:29 +02:00
Gerald Raab 58738112e9 typo 2016-05-26 05:19:33 +02:00
Gerald Raab 18036f7a40 Studienjahr im rdf 2016-05-26 05:16:31 +02:00
Gerald Raab 7733f8df79 matr_nr added 2016-05-26 05:00:38 +02:00
Gerald Raab 5fd6070ea3 list changes 2016-05-26 04:47:05 +02:00
Gerald Raab d7dc25dbc5 liste erweitert 2016-05-26 04:33:31 +02:00
Gerald Raab de5eefc6fb expand list 2016-05-26 04:14:49 +02:00
Gerald Raab e390c49b2b added mat_nr 2016-05-26 03:38:01 +02:00
Gerald Raab 04955a3ff1 Weiche f. milano 2016-05-26 03:10:53 +02:00
Gerald Raab 41bf684767 Matrikelnummer from Person added for use in generated list 2016-05-26 01:38:20 +02:00
Gerald Raab 9d0b2c1f0c studienjahr_kurzbz added 2016-05-25 18:56:54 +02:00
Gerald Raab 54f8dfead7 studienjahr im rdf 2016-05-25 18:38:37 +02:00
Gerald Raab d47e506976 Ital. LV Bezeichnung 2016-05-24 17:05:48 +02:00
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
Andreas Moik 6214ad3a66 multiple rdfs changed from student_uid to prestudent_id _GET and return 2016-05-23 10:52:47 +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
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
Gerald Raab 103f3f10af New Template for Milano 2016-05-20 13:44:58 +02:00
Gerald Raab f5f56056ca Ital. phrase 2016-05-20 11:28:02 +02:00
Gerald Raab da7036d33a Bugfix ExamReg, Geburtsort instudent xml, Hide Moodle-Icon if not used 2016-05-20 10:25:32 +02:00
Andreas Moik 7115ef2443 Merge branch 'master' into eine_uid 2016-05-19 15:56:36 +02:00
Andreas Moik 92ee653ae4 tbl_student to tbl_prestudent finished 2016-05-19 15:55:49 +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
Andreas Moik 5f9aa4474e Merge branch 'master' into eine_uid 2016-05-18 11:03:13 +02:00
Andreas Moik c2512a5755 div 2016-05-18 10:32:35 +02:00