oesi b8177b58e8 Merge branch 'master' into ci ...

Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php

2017-01-20 11:05:08 +01:00

..

cisdocs

re-add Files deleted from History

2015-01-18 09:26:16 +01:00

infoterminal

- Fehlermeldung am Infoterminal entfernt

2015-05-28 17:19:29 +02:00

private

Merge branch 'master' into ci

2017-01-20 11:05:08 +01:00

public

BugFix Incoming Platform

2016-12-05 12:13:17 +01:00

testtool

Testtool, Auswertung und Reihungstestadministration benutzen nun die neuen Reihungstestanmeldetabelle

2016-12-20 12:38:36 +01:00

ampel.php

Ampelsystem: New attribute "verpflichtend"

2016-09-29 17:51:36 +02:00

index_login.php

Anpassungen an CIS-Redesign

2013-07-19 15:32:08 +00:00

index.html

Logo von DEFAULT_STYLE; Neuer Ordner styles/default

2015-10-16 12:19:38 +02:00

index.php

Ampelsystem: New attribute "verpflichtend"

2016-09-29 17:51:36 +02:00

menu.php

Fixed XSS issues

2016-11-24 17:04:46 +01:00