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

..

images

Icons Reihungstestverwaltung, DB update

2016-07-28 11:39:48 +02:00

sounds

Flash-Player aus Testtool entfernen

2015-04-10 15:51:28 +02:00

styles

Logo Anzeigefehler bei LVInformationen behoben

2016-02-18 15:30:54 +01:00

cis.css

Anpassungen an CIS-Redesign

2013-07-19 15:49:42 +00:00

colorpicker.css

Colorpicker Skin und CSS

2013-06-14 12:18:17 +00:00

CSS and JavaScript.txt

2011-01-17 10:05:24 +00:00

fas.css

Notizen bei Studierenden im FAS hinzugefuegt; Eigene Notizen Karteireiter im FAS; Loeschen von Dokumenten; Anmerkung Editieren von Dokumenten; Typ Aendern von Dokumenten;

2014-06-11 12:31:11 +00:00

fhcomplete_website.css

Colorpicker Skin und CSS

2013-06-14 12:18:17 +00:00

fhcomplete.css

Warning CSS hinzugefügt

2015-05-04 16:39:26 +02:00

flexcrollstyles.css

Anpassungen an CIS-Redesign

2013-07-19 15:49:42 +00:00

infoscreen.css

Infoscreen an Redesign angepasst

2013-09-13 18:53:47 +00:00

jquery-ui-1.9.2.custom.min.css

Merge Praktikant into Master

2015-07-31 13:15:53 +02:00

jquery-ui.css

2010-11-22 14:15:31 +00:00

jquery.css

2011-01-26 13:01:16 +00:00

jquery.Jcrop.css

Merge Praktikant into Master

2015-07-31 13:15:53 +02:00

jquery.ui.timepicker.css

Date- und Timepicker in Zeitaufzeichnung

2015-02-03 17:02:43 +01:00

planner.css

Planner:

2011-10-25 15:08:09 +00:00

print.css

Anpassungen an CIS-Redesign

2013-07-19 15:49:42 +00:00

simplecropper.css

Merge Praktikant into Master

2015-07-31 13:15:53 +02:00

style.css.php

Anpassungen an CIS-Redesign

2013-07-19 15:49:42 +00:00

superfish.css

- Phrasen Modul

2011-04-18 14:21:15 +00:00

tablesort.css

2011-01-13 15:47:39 +00:00

tempus.css

Inaktive MitarbeiterInnen werden ausgegraut

2016-10-28 14:51:43 +02:00

vilesci.css

Inaktive OEs ausgrauen, doppelte CSS einträge

2015-03-24 21:06:29 +01:00

wawi.css

Sortieren von Beträgen mit Tausenderpunkt und Komma

2012-07-03 14:23:13 +00:00