blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,614 Commits 211 Branches 6 Tags
00685a67a4f4f58a2fa4e0302238569baad072fe
Commit Graph

385 Commits

Author SHA1 Message Date
oesi 68a696cdc8 Merge branch 'master' into ci 
Conflicts:
	cis/testtool/admin/add_gebiet.php
	cis/testtool/admin/edit_gebiet.php
	cis/testtool/admin/index.php
	config/global.config-default.inc.php
	content/student/studentDBDML.php
	content/student/studentdetailoverlay.xul.php
	include/ablauf.class.php
	include/frage.class.php
	include/organisationseinheit.class.php
	include/studiengang.class.php
	include/vorschlag.class.php
	phpci.yml
	rdf/student.rdf.php
	system/dbupdate_3.2.php
	tests/codeception/_support/AcceptanceTester.php
	tests/codeception/_support/BasisKlasseTest.php
	tests/codeception/_support/FunctionalTester.php
	tests/codeception/_support/UnitTester.php
	tests/codeception/_support/_generated/AcceptanceTesterActions.php
	tests/codeception/acceptance/AcceptanceTester.php
	tests/codeception/acceptance/CISLoginPageCept.php
	tests/codeception/acceptance/_bootstrap.php
	tests/codeception/codeception.dist.yml
	tests/codeception/functional/FunctionalTester.php
	tests/codeception/functional/_bootstrap.php
	tests/codeception/tests/acceptance.suite.dist.yml
	tests/codeception/tests/acceptance/CISLoginPage.php
	tests/codeception/tests/acceptance/CISLoginPageCept.php
	tests/codeception/tests/api/_bootstrap.php
	tests/codeception/tests/functional/FunctionalTester.php
	tests/codeception/tests/functional/_bootstrap.php
	tests/codeception/tests/unit/BasisKlasseTest.php
	tests/codeception/tests/unit/UnitTester.php
	tests/codeception/unit/BasisKlasseTest.php
	tests/codeception/unit/UnitTester.php
 2016-11-22 13:58:29 +01:00
kindlm e32fb99552 Bugfix Incoming Plattform 2016-11-04 13:37:51 +01:00
Gerald Raab 777916481f new page to change exam time and date 2016-10-30 20:32:09 +01:00
oesi 488d0614dd LehreinheitID zur LVA-Liste hinzugefügt 2016-10-17 14:35:05 +02:00
kindlm da737c0366 Überarbeitung Incoming-Plattform 
- GUI an CIS-Design angepasst
- Dokumenttypen für Upload kommen nun aus tbl_dokumentstudiengang
- Filter bei LV-Auswahl verbessert
- Diverse GUI-Verbesserungen (Datepicker,  Legenden, Abschlussseite,
...)
- Phrasenanpassungen
 2016-10-12 18:34:48 +02:00
oesi 01b577603a - Karteireiter Aufnahmetermine überarbeitet 
- Reihungstest-Felder in Prestudent Karteireiter entfernt
 2016-10-11 12:28:44 +02:00
Stefan Puraner ceb2ef0dbf updated phrasen 2016-10-03 13:48:21 +02:00
kindlm 1af4938ab2 Ampelsystem: New attribute "verpflichtend" 
- New attributes "verpflichtend"(mandatory) and "buttontext" in the
ampelsystem
- Verpflichtende Ampeln are shown as div-popup on the CIS every time the
page refreshes till the notification is confirmed.
- Text of the confirm-button is changeable (fallback to default-phrase)
- Only the notifications of the current semester are shown by default
("show all" as button)
 2016-09-29 17:51:36 +02:00
kindlm 46e2c967ab Partnerhochschulen Übersicht CIS 2016-09-23 11:08:56 +02:00
Paolo 40a2b53858 Merge master into HEAD 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
 2016-08-18 16:23:11 +02:00
kindlm 35f8bab8b2 Aufnahmeverfahren fhstp 
- Funktion loadReihungstestPerson
- Anpassungen Excel-Export
 2016-08-11 09:56:23 +02:00
oesi 4edc917b3d Menüpunkt für Bewerberakt hinzugefügt 2016-07-27 16:52:04 +02:00
kindlm c57aa20058 Incoming-Plattform überarbeitet 
- Zählung Anmeldungen korrigiert
- Learning Agreement als statischer Link ins DMS
- StudiengangsDropDown auch englisch
- "Austausch" und "Freemover" in Austauschprogramm-DropDown
 2016-07-13 10:53:50 +02:00
Gerald Raab 4abf10d3e3 phrases for pruefungstool 2016-07-11 15:52:31 +02:00
oesi 37c1721aeb Buttons und Menüpunkt zum Versenden und Antworten auf Messages hinzugefügt 2016-07-07 22:52:48 +02:00
oesi 5de98911ec Link zu LV-Infos zur Lehrveranstaltungsübersicht hinzugefügt 2016-07-05 13:57:26 +02:00
Gerald Raab b14a1f30ba Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-21 15:10:15 +02:00
Gerald Raab 3c93439955 ital phrases 2016-06-21 15:09:49 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Gerald Raab f2b45b7f2a ital phrases 2016-06-19 19:03:11 +02:00
Gerald Raab a4fbebbf30 layout pruefungsanmeldeliste, ital phrases 2016-06-15 00:38:19 +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
Gerald Raab 5b0a843500 ital. phrases 2016-05-30 17:32:50 +02:00
Gerald Raab 01143cd51d it phrase 2016-05-26 22:17:29 +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
kindlm d899ccad08 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:25:14 +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
Gerald Raab f5f56056ca Ital. phrase 2016-05-20 11:28:02 +02:00
Gerald Raab 2bc42d7903 ital 2016-05-14 13:51:53 +02:00
Gerald Raab 6dab0aec8d Ital phrases 2016-05-14 11:16:00 +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 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
kindlm 197064d44d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-25 12:23:14 +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
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 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
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
Gerald Raab 1ffee2dcda Course Registration icon if enrolled different, locale 2016-04-05 15:10:48 +02: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