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

..

dbupdate_3.2

Improve Studienplan guessing on RT migration

2016-11-21 13:10:18 +01:00

mlists

Merge branch 'master' into ci

2016-11-22 13:58:29 +01:00

moodlePlugin

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

2016-05-23 12:25:14 +02:00

services

bugfix for unoconv systemd service killmode

2016-08-24 15:46:48 +02:00

sync

BugFix Sync-Mail LV-Plan

2016-11-17 16:23:00 +01:00

templates

Anzeige CIS Funktionen "jgv" und "hsv"

2016-01-22 12:36:03 +01:00

UnitTests

Update AddOn Studienplatzverwaltung

2014-11-20 17:28:32 +00:00

vorlage_zip

Dokumentenakt

2016-07-27 17:18:38 +02:00

xsl

Merge branch 'master' into ci

2016-11-22 13:58:29 +01:00

.htaccess_exmpl

rename htaccess

2014-06-11 15:24:53 +00:00

abgabe2opus.php

Fehler beim Ermitteln des Lehrfachs behoben

2014-04-14 08:11:54 +00:00

account_deaktivierung_mail.php

Mail Empfänger korrigiert

2014-08-12 05:52:43 +00:00

ampel_erinnerungsmail.php

Email-Benachrichtigung bei Ampeln, wenn Flag gesetzt

2014-05-09 13:05:48 +00:00

check_neue_lektoren.php

2009-07-07 07:42:01 +00:00

check_studentlehrverband.php

Anpassungen damit Script über Cronjob ausgeführt werden kann

2015-08-18 09:37:30 +02:00

checkcomposer.php

Touch Me

2015-11-19 17:32:56 +01:00

checkdb.php

FHComplete WaWi Datenbankschema

2010-10-13 08:46:19 +00:00

checkphp.php

Touch Me

2015-11-19 17:32:56 +01:00

checkroles.php

orgform widget + neues recht

2016-07-05 14:34:50 +02:00

checkStudenten.php

Warning behoben

2014-09-23 06:07:38 +00:00

checksystem.php

orgform widget + neues recht

2016-07-05 14:34:50 +02:00

database.inc.php

Projektmanagement

2011-05-16 07:13:22 +00:00

dbupdate_3.0.php

BugFix Migration

2016-04-10 19:46:35 +02:00

dbupdate_3.1.php

checksystem

2016-02-04 11:50:55 +01:00

dbupdate_3.2.php

Merge branch 'master' into ci

2016-11-22 13:58:29 +01:00

erinnerungsmail_coodle.php

Cronjob für Erinnerungsmail für abgelaufene Coodle Umfragen

2013-04-03 09:20:38 +00:00

erinnerungsmail_sek_lehrauftrag.php

2011-04-13 07:06:57 +00:00

erinnerungsmail_sek_preinteressent.php

2009-07-07 07:42:01 +00:00

FH-Complete.txp

DB-Schema für Gemeinsame Studien hinzugefügt

2016-10-18 17:11:02 +02:00

FH-Complete.xmi

rename htaccess

2014-06-11 15:24:53 +00:00

fhcomplete3.0.sql

Checkroles

2016-06-28 22:10:56 +02:00

FHCompleteTDM3PG83.xsl

2009-05-20 14:45:47 +00:00

generatestudienordnung.php

Seeds and DBTools extension

2016-07-05 19:12:54 +02:00

insert_bis_bundesland.sql

2007-11-30 12:57:05 +00:00

insert_bis_gemeinde_2007.sql

2008-02-29 14:45:32 +00:00

insert_bis_nation.sql

2007-11-30 13:26:25 +00:00

insert_system_tables.sql

2008-02-29 14:45:32 +00:00

konsistenzpruefung.php

Prüfscript zum Aufdecken von Inkonsitenten Datenbestaenden

2015-05-04 16:31:49 +02:00

phpinfo.php

2007-11-30 11:17:12 +00:00

prestudentstatus_studienplan_id.php

added restart button

2016-09-05 10:46:45 +02:00

pruefung_bestaetigen.php

Cronjob zur automatisierten Prüfungsbenachrichtigung; Anpassungen Dokumente KTU

2014-09-30 09:43:05 +00:00