Commit Graph

1774 Commits

Author SHA1 Message Date
Andreas Moik aedd895b94 added TODO EINE comment for non-unique $student->prestudent_id 2016-06-10 11:55:43 +02:00
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 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
Gerald Raab 5b0a843500 ital. phrases 2016-05-30 17:32:50 +02:00
Andreas Moik d136937aa0 pruefungsanmeldung.json.php changed for eine_uid 2016-05-30 14:03:13 +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 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
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
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
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
Andreas Moik 4cdd47669a cleanups 2016-05-18 09:50:23 +02:00
Andreas Moik 81a1b35ee6 cleanups 2016-05-18 09:31:04 +02:00
Andreas Moik 249076bfcc tbl_student changed to tbl_prestudent 2016-05-18 09:11:17 +02:00
Gerald Raab 6dab0aec8d Ital phrases 2016-05-14 11:16:00 +02:00
Andreas Moik 2eb0df0716 replaced tbl_student 2016-05-11 11:16:57 +02:00
Andreas Moik 068bcddb07 mlists: tbl_student replaced 2016-05-10 14:17:27 +02:00
Andreas Moik a63be15c8b removed two obsolete files 2016-05-09 16:59:26 +02:00
Andreas Moik 3258b23c0a bewerberstatistik changes 2016-05-09 16:47:26 +02:00
Gerald Raab f0bee0d531 Ital Phrases, Error in Classfile localised 2016-05-04 14:42:09 +02:00
Gerald Raab edc62cd25a Ital Phrases 2016-05-02 15:43:23 +02:00
Gerald Raab c7b791f160 Prüfungsverwaltung debugged 2016-05-02 15:23:36 +02:00
Gerald Raab 75c8d82b73 Ital Phrase 2016-05-01 15:51:46 +02:00
Gerald Raab 44b4571aaf Prüfungsverwaltung 2016-05-01 15:31:23 +02:00
Gerald Raab c0b7f3ba88 ital phrases 2016-04-29 18:00:50 +02:00
kindlm 202fcec66d Bugfixes for Incoming-Tool
- Upload Picture fixed
- Multilanguage for document-upload
- Removed Picture from document-upload
- All courses are shown. Even those without vacancies
- Phrase for no vacancies
2016-04-29 17:33:51 +02:00
Andreas Moik b5a4645540 changes for tbl_zeugnisnote 2016-04-27 18:01:25 +02:00
kindlm 9826af257f Courses of ECI-Degree-Program shown in Incoming-Tool 2016-04-27 13:54:47 +02:00
Andreas Moik 5d3032e5de many bugfixes
changed some tbl_student to tbl_prestudent
2016-04-27 13:42:29 +02:00
Andreas Moik dd4b14fe99 changes for lehre.tbl_pruefung 2016-04-25 14:02:26 +02:00
kindlm 197064d44d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-25 12:23:14 +02:00
kindlm 6940f72d58 Addon-Ability stpl_week.php for lehrmittel/software 2016-04-25 11:37:25 +02:00
Andreas Moik 975ab02d74 Merge branch 'master' into eine_uid 2016-04-21 14:08:44 +02:00
Gerald Raab 1ffa831887 include generated pruefung.js.php 2016-04-21 09:36:00 +02:00
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
Andreas Moik a4b67c5072 changes for tbl_projektarbeit student_uid to prestudent_id 2016-04-20 10:38:48 +02:00
Andreas Moik b3a77052f7 db changes for eine_uid
-lehre.tbl_abschlusspruefung.student_uid -> prestudent_id
	-public.tbl_studentlehrverband.student_uid -> prestudent_id
2016-04-19 15:31:15 +02:00