Paminger 2dada5200c Merge branch 'master' into ci ...

Conflicts:
	.gitignore
	composer.json
	include/prestudent.class.php
	include/securimage/securimage.php
	include/studienplan.class.php
	system/dbupdate_3.2.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
	tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
	tests/codesniffer/FHComplete/ruleset.xml
	tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
	tests/codesniffer/FHComplete/tests/TestHelper.php
	tests/codesniffer/FHComplete/tests/bootstrap.php
	tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
	tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
	tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
	tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
	tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
	tests/codesniffer/FHComplete/tests/files/control_structure_while.php
	tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
	tests/codesniffer/FHComplete/tests/files/double_space.php
	tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
	tests/codesniffer/FHComplete/tests/files/function_spacing.php
	tests/codesniffer/FHComplete/tests/files/mixing_indent.php
	tests/codesniffer/FHComplete/tests/files/multiple_use.php
	tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
	tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
	tests/codesniffer/FHComplete/tests/files/space_tab.php
	tests/codesniffer/FHComplete/tests/files/tab_space.php
	tests/codesniffer/FHComplete/tests/files/traits_no_order.php
	tests/codesniffer/FHComplete/tests/files/traits_pass.php
	tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
	tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
	tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_no_order.php
	tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
	tests/codesniffer/FHComplete/tests/files/use_with_commas.php
	tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
	tests/codesniffer/FHComplete/tests/ruleset.xml

2016-04-28 18:14:40 +02:00

..

mlists

Fehler beim Erstellen der HSV Verteiler behoben

2016-03-03 16:32:50 +01:00

moodlePlugin

Bei der Notenübernahme aus Moodle wird nun ein zusätzlicher Parameter übergeben der angibt ob Noten oder Prozentpunkte übernommen werden sollen.

2015-02-24 11:01:31 +01:00

sync

LV-Plan Update Mail ist nun zweisprachig Deutsch/Englisch

2016-02-01 11:12:09 +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

ODT-Vorlage für Zeugnis Englisch Neu

2016-02-23 19:14:49 +01:00

xsl

PreStudentID for StudentPrintAusbildungsvertrag

2016-04-25 11:31:15 +02: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

checkStudenten.php

Warning behoben

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

checksystem.php

checksystem

2016-02-04 11:50:55 +01: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-04-28 18:14:40 +02: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 Entwurf für Softwareverwaltung erstellt

2016-01-28 18:54:09 +01:00

FH-Complete.xmi

rename htaccess

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

fhcomplete3.0.sql

PHPCI-Install

2016-04-27 10:34:49 +02:00

FHCompleteTDM3PG83.xsl

2009-05-20 14:45:47 +00: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

hint added to prestudentstatus-updatescript

2016-03-18 09:26:47 +01:00

pruefung_bestaetigen.php

Cronjob zur automatisierten Prüfungsbenachrichtigung; Anpassungen Dokumente KTU

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