Merge branch 'trunk' into trunk_result

Customizing/README.md

@@ -0,0 +1,68 @@
+# Customizing
+
+<!-- MarkdownTOC depth=0 autolink="true" bracket="round" autoanchor="true" style="ordered" indent="   " -->
+
+1. [Introduction](#introduction)
+1. [User Agreements](#user-agreements)
+1. [System Language Changes](#system-language-changes)
+1. [Skins and Styles](#skins-and-styles)
+
+<!-- /MarkdownTOC -->
+
+<a name="introduction"></a>
+# Introduction
+
+This directory holds all customized files for this ilias installation.
+
+On the top level two directories may be created: ```/Customizing/global``` for global 
+changes and ```/Customizing/clients``` for changes that should be applied to clients.
+
+The clients directory holds a subdirectory for each client:
+
+```/Customizing/clients/<client_id>```
+
+At the time being, only user agreements can be offered for clients! Customized skins and languages are only supported globally.
+
+
+<a name="user-agreements"></a>
+# User Agreements
+
+User agreement texts are stored within html files. They can be defined globally
+for all clients or on a client level.
+
+**Global user agreements:**
+
+```/global/agreement/agreement_<lang_code>.html```
+
+Example:
+
+```/global/agreement/agreement_fr.html```
+
+**Client specific user agreements:**
+
+```/clients/<client_id>/agreement/agreement_<lang_code>.html```
+
+Example:
+
+```/clients/default/agreement/agreement_fr.html```
+
+
+<a name="system-language-changes"></a>
+# System Language Changes
+
+You may change terms used in the user interface of ILIAS. To do this, use the
+same format as is used in the language files in directory ```/lang```. Store the
+values to be overwritten in files ending with ```.lang.local``` and put them into
+the ```/global/lang``` directory. Client specific changes are not supported yet.
+
+```/global/lang/ilias_<lang_code>.lang.local```
+
+Example:
+
+```/global/lang/ilias_en.lang.local```
+
+<a name="skins-and-styles"></a>
+# Skins and Styles
+
+You find all information about how to create your own skin in the 
+[Custom Styles](/templates/Readme.md#custom-styles) documentation.

Modules/Bibliographic/maintenance.json

@@ -0,0 +1,17 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "fschmid(21087)",
+    "second_maintainer": "",
+    "implicit_maintainers": [
+        "mstuder(8473)",
+        "gcomte(27130)",
+        "otruffer(29130)",
+        "ttruffer(42894)"
+    ],
+    "coordinator": "",
+    "tester": "marko.glaubitz(28309)",
+    "testcase_writer": "mstuder(8473)",
+    "path": "Modules/Bibliographic",
+    "belong_to_component": "Bibliographic List Item",
+    "used_in_components": []
+}

Modules/Blog/maintenance.json

@@ -0,0 +1,12 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "akill(27631)",
+    "second_maintainer": "",
+    "implicit_maintainers": [],
+    "coordinator": "",
+    "tester": "",
+    "testcase_writer": "KlausVorkauf(5890)",
+    "path": "Modules/Blog",
+    "belong_to_component": "Blog",
+    "used_in_components": []
+}

Modules/BookingManager/maintenance.json

@@ -0,0 +1,12 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "akill(27631)",
+    "second_maintainer": "",
+    "implicit_maintainers": [],
+    "coordinator": "",
+    "tester": "wolfganghuebsch(18455)",
+    "testcase_writer": "e.coroian(37215)",
+    "path": "Modules/BookingManager",
+    "belong_to_component": "Booking Tool",
+    "used_in_components": []
+}

Modules/Category/maintenance.json

@@ -0,0 +1,12 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "akill(27631)",
+    "second_maintainer": "smeyer(191)",
+    "implicit_maintainers": [],
+    "coordinator": "",
+    "tester": "miriamhoelscher(25370)",
+    "testcase_writer": "kunkel(115)",
+    "path": "Modules/Category",
+    "belong_to_component": "Category and Repository",
+    "used_in_components": []
+}

Modules/CategoryReference/maintenance.json

@@ -0,0 +1,12 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "",
+    "second_maintainer": "",
+    "implicit_maintainers": [],
+    "coordinator": "",
+    "tester": "",
+    "testcase_writer": "",
+    "path": "Modules/CategoryReference",
+    "belong_to_component": "None",
+    "used_in_components": []
+}

Modules/Chatroom/chat/AppContainer.js

@@ -31,7 +31,7 @@ var AppContainer = function AppContainer() {
 
 	var _server;
 
-	var _timeouts = [];
+	var _timeouts = {};
 
 	/**
 	 * @type {Logger}
@@ -84,23 +84,16 @@ var AppContainer = function AppContainer() {
 	this.setServer = function(server) { _server = server; };
 	this.getServer = function() { return _server; };
 
-	this.setTimeout = function(subscriberId, timeout) {
-		_timeouts[subscriberId] = timeout;
-	};
+	this.setTimeout = function(subscriberId, callback, delay) {
+		var timeout = setTimeout(callback, delay);
 
-	this.getTimeout = function(subscriberId) {
-		for(var index in _timeouts) {
-			if(index == subscriberId) {
-				return _timeouts[subscriberId];
-			}
-		}
+		_timeouts[subscriberId] = timeout;
 	};
 
 	this.removeTimeout = function(subscriberId) {
-		for(var index in _timeouts) {
-			if(index == subscriberId) {
-				delete _timeouts[subscriberId];
-			}
+		if (_timeouts.hasOwnProperty(subscriberId)) {
+			clearTimeout(_timeouts[subscriberId]);
+			delete _timeouts[subscriberId];
 		}
 	};