Commit Graph

1752 Commits

Author SHA1 Message Date
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
Stefan Puraner b579c14a5d save bewertung bugfix 2016-04-12 15:31:38 +02:00
Stefan Puraner 325243f165 pruefungstyp is now calculated by countinig past attempts 2016-04-11 13:27:37 +02:00
Stefan Puraner a2bc0c6f80 registration for exam 2016-04-11 10:53:15 +02:00
Stefan Puraner 80c35f4b6b Anpassungen für KU Linz; Studienblatt, LV Zeugnis, Anzeige von Noten
kompatibler LVs im Studienplan
2016-04-07 10:57:03 +02:00
Andreas Moik 9db228b9d0 Merge branch 'master' into eine_uid 2016-04-06 11:25:46 +02:00
Andreas Moik 3b22c6bd07 bugfix 2016-04-06 10:14:52 +02:00
Andreas Moik 5b678f5fa6 benotungstool changed for uid 2016-04-06 09:17:03 +02:00
Gerald Raab bd964771fb Bugfix 2016-04-05 15:22:09 +02:00
Gerald Raab 1ffee2dcda Course Registration icon if enrolled different, locale 2016-04-05 15:10:48 +02:00
Andreas Moik 7cda05f4f9 legesamtnoteeintragen and legesamtnoteverwalten changed request from student_uid to prestudent_id 2016-04-05 12:08:42 +02:00
Andreas Moik 3af78fa550 legesamtnoteverwalten now needs a prestudent_id instead of a student_uid 2016-04-05 11:28:13 +02:00
Andreas Moik 11844a5739 bugfixes 2016-03-31 10:18:00 +02:00
Andreas Moik b55ae03e1e bugfixes 2016-03-31 09:48:50 +02:00
Andreas Moik 683a881fe7 changed campus.tbl_legesamtnote for eine_uid 2016-03-30 16:35:20 +02:00
Andreas Moik 6006cfd424 campus.tbl_studentuebung changed for eine_uid 2016-03-30 16:21:50 +02:00
Andreas Moik 9896d527e3 tbl_studentbeispiel changed for eine_uid 2016-03-30 11:50:52 +02:00
Andreas Moik 8d43fdc90f updated campus.tbl_lvgesamtnote to prestudent_id 2016-03-23 16:12:48 +01:00
kindlm 5917419cb7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	locale/de-AT/incoming.php
#	locale/en-US/incoming.php
2016-03-15 20:46:14 +01:00
kindlm 678d1fa782 Legende bei Notenliste, was Markierung bedeutet 2016-03-14 17:35:33 +01:00
oesi c65c57b984 Studienplan kann von Addons ueberschrieben werden 2016-03-11 15:58:46 +01:00
oesi 3dfdce733f Incomingverwaltung
- Logo Pfad korrigiert
- Capture bei Incoming Registrierung hinzugefügt
- Mailtexte überarbeitet
2016-03-11 14:45:22 +01:00
oesi 24c3e865d7 VarDump entfernt 2016-03-10 09:18:12 +01:00