FishEye: history OLAT/olat3/LICENSE.TXT

Revision	Date	Message	Lines	Author	Branch
1.48	17 Jun 10	OLAT-5196 load license text from a file called NOTICE.TXT instead of LICENSE.TXT missing TXT files	+2 -108	Patrick Brunner	MAIN
1.47	15 Jan 10	OLAT-4742: new license period and new collaborators	+2 -2	hjzuber	MAIN
1.46	15 Jan 10	OLAT-4742: new license period and new collaborators	+3 -3	hjzuber	MAIN
1.45	03 Aug 09	OLAT-4095: xss filter based on owasp AntiSamy	+4	rhaag	MAIN
1.44	30 Jun 09	non-jira: adding timo to list of contributers	+1 -1	gnaegi	MAIN
1.43	04 May 09	updating contributers	+2 -2	gnaegi	MAIN
1.42	29 Jan 09	Added Renata and Kristina	+1 -1	hjzuber	MAIN
1.41	08 Jan 09	non-jira: adding maurus and stefan as code contributors	+3 -3	gnaegi	MAIN
1.40	01 Jun 08	Merge BRANCH into HEAD: context sensitive help files for all languages	+4 -4	hjzuber	MAIN
1.39	04 Apr 08	OLAT-2725 Adding YAML credits to about page with back link to yaml homepage as requested by the YAML license terms	+6 -2	gnaegi	MAIN
1.38	07 Sep 07	MERGE 5.2.x Branch (5.2.1-RC01 Tag) to HEAD	+13 -10	Patrick Brunner	MAIN
1.37	16 Mar 07	OLAT-2230 Integrated Quartz scheduler module. More work is to do here	+3	gnaegi	MAIN
1.36	28 Feb 07	merge to head	+1 -1	schnider	MAIN
1.35	23 Feb 07	CS-help	+1 -1	hjzuber	MAIN
1.34	21 Dec 06	OLAT-2045: new tooltip library which will replace overlib soon	+2 -4	schnider	MAIN
1.33	03 Nov 06	adding frentix	+3	gnaegi	MAIN
1.32	17 Oct 06	updated license information	+4	schnider	MAIN
1.31	21 Sep 06	added christian to names	+1 -1	schnider	MAIN
1.30	20 Sep 06	wording adjusted in accordance with license update (apache 2.0)	+13 -24	mweber	MAIN
1.29	08 Sep 06	add names	+3 -3	hjzuber	MAIN
1.28	06 Jul 06	OLAT-1574: thanx to Carsten, Gnägi and Zubi can write their names properly	+1 -1	hjzuber	MAIN
1.27	06 Jul 06	OLAT-1574: correct line delimiters for better CVS diffs	+101 -1	cweisse	MAIN
1.26	19 May 06	check the CVS access (rw) from BPS * my name corrected ;-)	+1 -1	cweisse	MAIN
1.25	01 Mar 06	added persons Ingmar Kroll Lars Eberle as code contributers	+1 -1	Patrick Brunner	MAIN
1.24	20 Feb 06	licence update. see http://bugzilla.olat.org/jira/browse/OLAT-1313	+1 -1	stuckia	MAIN
1.23	19 Dec 05	Merge from OLAT-4_0_2-ZAG Branch OLAT-1274 (Change password configuration) OLAT-1254 (Create new file in briefcase) OLAT-1253 (HTML Editor upgrade to TinyMCE) OLAT-1279 (Show static resources after login) OLAT-1290 (Intranet site extension)	+1 -1	gnaegi	MAIN
1.22	26 Sep 05	Adding configuration support for Postgres database Thanks to Sebastian HennebrŸder for the patches http://bugs.olat.org/jira/browse/OLAT-1168	+1 -1	gnaegi	MAIN
1.21	26 Sep 05	corrections of current install docu	+1 -1	schnider	MAIN
1.20	19 Sep 05	license updates for reload and pfpl stuff	+1 -1	schnider	MAIN
1.19	19 Sep 05	updating contributers and license	+1 -1	gnaegi	MAIN
1.18	24 Aug 05	- removed garfield portlet due to copyright issues - adding macartney comic portlet http://bugs.olat.org/jira/browse/OLAT-1025	+1 -1	gnaegi	MAIN
1.17	24 Jun 05	Adding the patch from Roberto Bagnoli that implements assessment notifications for qti tests - http://bugs.olat.org/jira/browse/OLAT-926	+1 -1	gnaegi	MAIN
1.16	06 Apr 05	update	+1 -1	hjzuber	MAIN
1.15	30 Mar 05	* empty log message *	+1 -1	hjzuber	MAIN
1.14	14 Feb 05	smack license added	+1 -1	schnider	MAIN
1.13	07 Feb 05	hessian.jar not yet needed, may be later	+1 -1	schnider	MAIN
1.12	18 Jan 05	* empty log message *	+1 -1	schnider	MAIN
1.11	12 Jan 05	adding license for rss4j	+1 -1	gnaegi	MAIN
1.10	10 Dec 04	- new translation style for browsercheck and cookies - reformatted about page - adding license to about page	+1 -1	gnaegi	MAIN
1.9	09 Dec 04	adding license stuff	+1 -1	gnaegi	MAIN
1.8	18 Oct 04	* empty log message *	+1 -1	gnaegi	MAIN
1.7	11 Oct 04	adding infos about other licenses	+1 -1	gnaegi	MAIN
1.6	05 Oct 04	adding jscalendar license notes (LGPL)	+1 -1	gnaegi	MAIN
1.5	21 Jul 04	add gs, pb	+1 -1	stuckia	MAIN
1.4	21 Jul 04	* empty log message *	+1 -1	hjzuber	MAIN
1.3	08 Jul 04	* empty log message *	+1 -1	mike	MAIN
1.2	17 May 04	* keyword substitution change *		mike	MAIN
1.1	17 May 04	Fresh, clean checkin	+1	mike	MAIN
1.34.8.1	13 Mar 07	First step from ant to maven brasato 1865 builds with maven maven -> produces a war file -> copy paste to tomcat and it starts	deleted	Patrick Brunner	MAVEN-1865
1.7.2.1	20 Oct 04	Merge from HEAD	+1 -1	mike	OLAT-3-1-x-BRANCH
1.22.6.2	14 Dec 05	Adding overlib again, still needed http://bugs.olat.org/jira/browse/OLAT-1253	+1 -1	gnaegi	OLAT-4_0_2-ZAG
1.22.6.1	14 Dec 05	- removed textual Kupu references - removed overlib library and textual references - enabled context sensitive menu for IE OLAT-1253	+1 -1	gnaegi	OLAT-4_0_2-ZAG
1.24.2.1	31 Mar 06	OLAT-1482 ajax -ify olat work in progress!	+1 -1	fjost	OLAT-4_1-GOODSOLUTIONS-1411
1.25.10.1	22 May 06	OLAT-1233:Merge HEAD into branch-1233	+1 -1	guretzki	OLAT-4_2_0-UNIZH-1233
1.26.2.1	25 Jul 06	merge HEAD into BRANCH-1530	+101 -1	Alexander Schneider	OLAT-4_2_0-UNIZH-1530
1.26.12.1	11 Jul 06	OLAT-1562: Work in progress; Merge HEAD into branch.	+101 -1	guretzki	OLAT-4_2_0-UNIZH-1562
1.26.4.1	21 Jul 06	merges from HEAD	+101 -1	gnaegi	OLAT-4_2_0-goodsolutions-1232
1.31.6.2	03 Nov 06	merged from HEAD to OLAT-5_0_y-BRANCH	+3	Alexander Schneider	OLAT-5_0_y-BRANCH
1.31.6.1	17 Oct 06	updated license information	+4	schnider	OLAT-5_0_y-BRANCH
1.32.2.2	30 Jan 07	merge Head to Branch ( target: HEAD common source: mergeHeadTo1879_1 )	+2 -4	Patrick Brunner	OLAT-5_1_0-BPS-1879
1.32.2.1	16 Nov 06	OLAT-1879 Merge HEAD into Branch 1879	+3	leberle	OLAT-5_1_0-BPS-1879
1.32.6.1	03 Nov 06	OLAT-1914 Merge HEAD to Branch	+3	leberle	OLAT-5_1_0-BPS-1914
1.34.6.2	27 Feb 07	updated license	+1 -1	schnider	OLAT-5_1_x-BRANCH
1.34.6.1	26 Feb 07	MERGE HEAD TO BRANCH	+1 -1	Alexander Schneider	OLAT-5_1_x-BRANCH
1.37.12.2	03 Sep 07	license updates	+1 -1	schnider	OLAT-5_2_x-BRANCH
1.37.12.1	30 Aug 07	license updates	+13 -10	schnider	OLAT-5_2_x-BRANCH
1.39.2.1	01 Jun 08	key changes for context sensitive help	+4 -4	hjzuber	OLAT-6_0_x-BRANCH
1.42.4.1	04 May 09	updating contributers	+2 -2	gnaegi	OLAT-6_1_x-BRANCH
1.44.4.1	18 Aug 09	MERGE with HEAD	+4	skoeber	OLAT-6_2-BPS-4072
1.40.2.1	03 Feb 09	head merged	+3 -3	bja	OLAT-HEAD-BPS-1229
1.28.8.2	15 Jun 07	OLAT-1595 : mergeOLAT-5_1_xToBranch	+10 -5	ikroll	OLAT-HEAD-BPS-1595
1.28.8.1	05 Oct 06	http://bugs.olat.org/jira/browse/OLAT-1595 OLAT-1595: Merge HEAD into BRANCH (work in progress)	+16 -27	ikroll	OLAT-HEAD-BPS-1595
1.32.4.2	06 Jan 08	OLAT-2434 Merging HEAD to CF branch, adding database migration script. There are some classes I had to patch in the core to make this branch work, I will commit them directly to HEAD when merging the branch back to HEAD, so this branch will not compile out of the box.	+13 -10	gnaegi	OLAT-HEAD-BPS-Prototype_CF
1.32.4.1	17 Jul 07	OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes	+10 -6	gnaegi	OLAT-HEAD-BPS-Prototype_CF
1.41.2.2	18 May 09	OLAT-3766 cpeditor: Update BRANCH from HEAD	+2 -2	gwassmann	OLAT-HEAD-FRENTIX-3766-CPEDITOR
1.41.2.1	09 Feb 09	OLAT-3766 Merge from HEAD to IMS CP editor branch	+1 -1	gnaegi	OLAT-HEAD-FRENTIX-3766-CPEDITOR
1.42.8.3	18 Aug 09	OLAT-3946 Podcast. Merge from HEAD	+4	gwassmann	OLAT-HEAD-FRENTIX-3946-Podcast
1.42.8.2	27 Jul 09	OLAT-3946 update from HEAD	+1 -1	gwassmann	OLAT-HEAD-FRENTIX-3946-Podcast
1.42.8.1	10 Jun 09	OLAT-3946 podcast: merge from head and some other changes	+2 -2	gwassmann	OLAT-HEAD-FRENTIX-3946-Podcast
1.47.10.1	09 Sep 10	OLAT-5494: merge head to epf-branch: olat3	+2 -108	rhaag	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO
1.28.2.1	03 Nov 06	Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD	+23 -27	gnaegi	OLAT-HEAD-JGS-1577
1.37.8.1	07 Sep 07	merge 5.2.1 from HEAD to 2433 tested locally	+13 -10	Patrick Brunner	OLAT-HEAD-UZH-OLAT_2433
1.40.4.2	28 May 09	OLAT-3674: merge head to branch	+3 -3	rhaag	OLAT-HEAD_FRENTIX-3674
1.40.4.1	12 Jan 09	merge Head to branch, part2	+3 -3	rhaag	OLAT-HEAD_FRENTIX-3674
1.33.12.1	17 Jan 07	- intermediate save - merge HEAD into Branch	+2 -4	Patrick Brunner	OLAT_5_1_-UZH-1983
1.45.16.1	27 Jan 10	merge with head	+5 -5	schnider	tmpOLAT-HEAD-640-until-2010-03-10

OLAT-5196
load license text from a file called NOTICE.TXT instead of LICENSE.TXT

missing TXT files

Author:	Patrick Brunner
Revision:	1.48
Changeset:	MAIN:patrickb:20100617190637
Date:	21:06 17 June 2010 (22 months)
Branch point for:	OLAT-7_0_x-PUBLIC OLAT-7_1-Backbutton OLAT-7_1_x-BRANCH OLAT_FRENTIX_5907_BACKUP_RESTORE
Tags:	Root_OLAT-HEAD-FRENTIX-5494-EPORTFOLIO OLAT-7_1-Backbutton$BP Root_OLAT-7_1-Backbutton CODE-REVIEW-7-0 before-commit-translations-20100901 mergeHeadTo5494 Root_OLAT-7_0_x-PUBLIC OLAT-7_0_x-PUBLIC$BP OLAT-7_0_0-PUBLIC-20100929 Root_OLAT_FRENTIX_5907_BACKUP_RESTORE OLAT_FRENTIX_5907_BACKUP_RESTORE$BP Root_OLAT-7_1_x-BRANCH OLAT-7_1_x-BRANCH$BP OLAT-7_1_0-RC01-20110207 CVS2HG_MIGRATION CVS2HG_MIGRATION_FORMATTED

OLAT-4742: new license period and new collaborators

Author:	hjzuber
Revision:	1.47
Changeset:	MAIN:hjzuber:20100115154129
Date:	16:41 15 January 2010 (2 years and 3 months)
Branch point for:	OLAT-6_3_0-PUBLIC OLAT-6_3_x-PATCHES OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-5494-EPORTFOLIO OLAT_6_4_0-BPS-Onyx_Integration
Tags:	OLAT-6_3_0-RC09-20100115 OLAT-6_3_0-RC10-20100118 OLAT-6_3_0-RC11-20100118 OLAT-6_3_0-RC12-20100120 OLAT-6_3_0-RC13-20100120 OLAT-6_3_0-RC14-20100122 OLAT-6_3_0-RC15-20100126 OLAT-6_3_0-RC16-20100127 OLAT-6_3_0-RC17-20100128 OLAT-6_3_0-RC18-20100201 OLAT-6_3_0-RC19-20100202 OLAT-6_3_0-RC20-20100203 OLAT-6_3_0-RC21-20100205 OLAT-6_3_0-RC22-20100208 OLAT-6_3_0-RC23-20100209 OLAT-6_3_0-RC24-20100209 OLAT-6_3_x-PATCHES$BP OLAT-6_3_0-PUBLIC$BP OLAT-6_3_0-PUBLIC-RC01-20100309 OLAT-6_3_0-PUBLIC-RC02-20100310 OLAT-6_3_0-PUBLIC-RC03-20100311 OLAT-6_3_0-PUBLIC-RC04-20100315 OLAT-6_3_0-PUBLIC-RC05-20100315 OLAT-6_3_0-PUBLIC-RC06-20100316 OLAT-6_3_0-PUBLIC-20100317 OLAT-6_3_0-PUBLIC-20100323 OLAT-6_3_1-PUBLIC-20100330 Root_OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-4057-RESTAPI$BP OLAT_6_4_0-BPS-Onyx_Integration$BP Root_OLAT_6_4_0-BPS-Onyx_Integration OLAT-Reprio_7_0_0-MS02-20100528 OLAT-Reprio_7_0_0-MS02-20100604 OLAT-6_3_2-RC01-20100604 OLAT-6_3_2-RC02-20100609 OLAT-6_3_2-RC03-20100611 OLAT-6_3_2-RC04-20100611 OLAT-HEAD-FRENTIX-5494-EPORTFOLIO$BP OLAT-6_3_2-PUBLIC-20100618 OLAT-6_3_3-RC01-20100812 OLAT-6_3_3-RC02-20100812 OLAT-6_3_3-RC03-20100818 OLAT-6_3_3-RC04-20100823 OLAT-6_3_3-before-OLAT-5954-Patch

OLAT-4742: new license period and new collaborators

Author:	hjzuber
Revision:	1.46
Changeset:	MAIN:hjzuber:20100115132737
Date:	14:27 15 January 2010 (2 years and 3 months)

OLAT-4095: xss filter based on owasp AntiSamy

Author:	rhaag
Revision:	1.45
Changeset:	MAIN:rhaag:20090803105214
Date:	12:52 03 August 2009 (2 years and 9 months)
Branch point for:	OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC OLAT-HEAD-FRENTIX-4261-Scorm-Result OLAT-HEAD-UZH-4272 OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353-2 OLAT-HEAD-UZH-4361 tmpOLAT-HEAD-640-until-2010-03-10
Tags:	OLAT-HEAD-FRENTIX-4261-Scorm-Result$BP Root_OLAT-HEAD-FRENTIX-4261-Scorm-Result Root_OLAT-HEAD-FRENTIX-4261_SCORMResults OLAT-6_2_0-RC01-20090804 OLAT-6_2_0-RC05-20090811 OLAT-6_2_0-RC12-20090907 OLAT-6_2_0-RC03-20090806 Root_OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC$BP Root_OLAT-6_2_x-BRANCH-PUBLIC Root_OLAT-HEAD-FRENTIX-4261-SCORes Root_OLAT-HEAD-UZH-4272 Root_OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353$BP OLAT-HEAD-UZH-4361$BP OLAT-6_2_0-RC06-20090813 OLAT-HEAD-UZH-4272$BP OLAT-6_2_0-RC13-20090915 Root_OLAT-HEAD-FRENTIX-4261-SCORMResults OLAT-6_2_0-RC11-20090904 OLAT-6_2_0-BRANCH-UZH$BP OLAT-6_2_0-RC04-20090810 OLAT-6_2_1-20091009 Root_OLAT-HEAD_UZH-4274 OLAT_6_2_0-RC09-20090831 OLAT-6_2_0-RC08-20090827 OLAT-6_2_0-BPS OLAT-6_2_0-RC07-20090826 OLAT-6_2_0-RC10-20090902 OLAT-6_2_0-RC02-20090805 mergeHeadTo3946-PODCAST last_nightly last_stable OLAT-6_2_2-RC01-20091028 OLAT-HEAD-UZH-4353-2$BP Root_OLAT-HEAD-UZH-4353-2 last_stable_20091101 OLAT-6_2_2-PUBLIC-20091110 OLAT_TF_20091202 Root_tmpOLAT-HEAD-640-until-2010-03-10 tmpOLAT-HEAD-640-until-2010-03-10$BP OLAT-6_3_0-RC01-20100104 OLAT-6_3_0-RC02-20010105 OLAT-6_3_0-RC03-20100107 OLAT-6_3_0-RC04-20100111 OLAT_6-3-0-RC05-20100112 OLAT_6-3-0-RC06-20100112 OLAT_6-3-0-RC07-20100113 OLAT_6-3-0-RC08-20100115

non-jira: adding timo to list of contributers

Author:	gnaegi
Revision:	1.44
Changeset:	MAIN:gnaegi:20090630085440
Date:	10:54 30 June 2009 (2 years and 10 months)
Branch point for:	OLAT-6_2-BPS-4072 OLAT-6_2_x-UZH-essassprj
Tags:	Root_OLAT-6_2_x-UZH-assessprj OLAT-6_2-BPS-4072$BP OLAT-6_2_x-UZH-essassprj$BP Root_OLAT-6_2-BPS-4072 Root_OLAT-6_2_x-UZH-essassprj Root_OLAT-HEAD-FRENTIX-3946-Podcast OLAT-6_2_0-BPS-ESAMO-24072009

updating contributers

Author:	gnaegi
Revision:	1.43
Changeset:	MAIN:gnaegi:20090504083859
Date:	10:38 04 May 2009 (3 years)
Branch point for:	OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-4057_REST_API
Tags:	OLAT-HEAD-UZH-2438$BP Root_OLAT-6_2_x-UZH-matthai Root_OLAT-HEAD_FRENTIX-3674 Root_OLAT-HEAD-UZH-4057_REST_API Root_OLAT-6_2_X-UZH-matthai Root_OLAT-HEAD-FRENTIX-3766-CPEDITOR Root_OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-6_2_0-MS01-20090622 mergeHeadTo3674 mergeHeadTo3766-CPEDITOR OLAT-6_2-BPS-FEATURES-JUNE-2009$BP Root_OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-4057_REST_API$BP

Added Renata and Kristina

Author:	hjzuber
Revision:	1.42
Changeset:	MAIN:hjzuber:20090129171111
Date:	18:11 29 January 2009 (3 years and 3 months)
Branch point for:	OLAT-6_1_x-BRANCH OLAT-6_2-BPS-FEATURES OLAT-HEAD-FRENTIX-3946-Podcast OLAT-HEAD-UZH-3892
Tags:	OLAT-HEAD-FRENTIX-3946-Podcast$BP OLAT-6_1_0-RC26-20090211 OLAT-6_1_0-RC25-20090210 OLAT-6_1_0-RC23-20090130 OLAT-6_1_0-RC24-20090209 OLAT-6_2-BPS-FEATURES$BP Root_OLAT-HEAD-UZH-3892 OLAT-6_1_0-RC27-20090223 OLAT-6_1_1-RC04-20090428 OLAT-6_1_1-RC06-20090430 OLAT-6_1_0-PUBLIC-20090312 OLAT-6_1_0-RC28-20090224 Root_OLAT-6_2-BPS-FEATURES OLAT-6_1_1-RC01-20090406 Root_OLAT-6_1_x-BRANCH OLAT-6_1_1-RC02-20090409 OLAT-6_1_x-BRANCH$BP OLAT-6_1_1-RC05-20090429 OLAT-6_1_1-RC03-20090416 OLAT-HEAD-UZH-3892$BP

non-jira: adding maurus and stefan as code contributors

Author:	gnaegi
Revision:	1.41
Changeset:	MAIN:gnaegi:20090108192513
Date:	20:25 08 January 2009 (3 years and 4 months)
Branch point for:	OLAT-HEAD-FRENTIX-3766-CPEDITOR
Tags:	OLAT-6_1_0-RC04-20090115 OLAT-6_1_0-RC02-20090112 OLAT-6_1_0-RC03-20090115 OLAT-6_1_0-RC06-20090119 OLAT-6_1_0-RC05-20090119 OLAT-6_1_0-RC07-20090120 OLAT-6_1_0-RC13-20090128 OLAT-HEAD-FRENTIX-3766-CPEDITOR$BP OLAT-6_1_0-RC19-20090129 OLAT-6_1_0-RC10-20090122 OLAT-6_1_0-RC15-20090129 OLAT-6_1_0-RC16-20090129 OLAT-6_1_0-RC11-20090123 OLAT-6_1_0-RC08-20090121 OLAT-6_1_0-RC14-20090128 OLAT-6_1_0-RC17-20090129 OLAT-6_1_0-RC09-20090122 OLAT-6_1_0-RC12-20090123

Merge BRANCH into HEAD: context sensitive help files for all languages

Author:	hjzuber
Revision:	1.40
Changeset:	MAIN:hjzuber:20080601174447
Date:	19:45 01 June 2008 (3 years and 11 months)
Branch point for:	OLAT-HEAD-BPS-1229 OLAT-HEAD_FRENTIX-3674
Tags:	before-commit-OLAT-3601-separation-i18n-project mmw_i18n_2008_07_22 i18n_merged_2008_07_22 OLAT-HEAD-BPS-1229$BP Root_OLAT-HEAD-BPS-1229 OLAT-HEAD_FRENTIX-3674$BP OLAT-6_1_0-RC01-20090108

OLAT-2725 Adding YAML credits to about page with back link to yaml homepage as requested by the YAML license terms

Author:	gnaegi
Revision:	1.39
Changeset:	MAIN:gnaegi:20080404085426
Date:	10:54 04 April 2008 (4 years and 1 month)
Branch point for:	OLAT-6_0_x-BRANCH
Tags:	OLAT-6_0_x-BRANCH$BP Root_OLAT-6_0_x-BRANCH

MERGE 5.2.x Branch (5.2.1-RC01 Tag) to HEAD

Author:	Patrick Brunner
Revision:	1.38
Changeset:	MAIN:patrickb:20070907114422
Date:	13:44 07 September 2007 (4 years and 8 months)
Branch point for:	OLAT-HEAD-UZH-2771 OLAT-HEAD-YAML-1725
Tags:	Merged-5_2_1-RC01-Into-HEAD Merged-2433-Branch-Into-HEAD_5_2_1 Before-moving-i18n-and-content-to-core-20071127 Root_OLAT-HEAD-UZH-2771 before-merge-cg-5_2_3_to_HEAD OLAT-HEAD-UZH-2771$BP before-merge-2725-YAML-to-HEAD OLAT-HEAD-YAML-1725$BP mergeHeadTo2725 after-merge-cg-5_2_3_to_HEAD Root_OLAT-HEAD-YAML-1725 Before_merge_5_2_x_into_Head_20070924 after-merge-gs-5_2_3_to_HEAD before-merge-2434-CF-to-HEAD mergeHeadToOLAT-HEAD-BPS-Prototype_CF after-merge-2725-YAML-to-HEAD

OLAT-2230 Integrated Quartz scheduler module. More work is to do here

Author:	gnaegi
Revision:	1.37
Changeset:	MAIN:gnaegi:20070316215335
Date:	22:53 16 March 2007 (5 years and 2 months)
Branch point for:	OLAT-2278 OLAT-2278-2 OLAT-5_2_x-BRANCH OLAT-HEAD-2438 OLAT-HEAD-UZH-2385 OLAT-HEAD-UZH-OLAT_2433
Tags:	Ready_to_seperate Before_Core_Lms_sep OLAT-2278$BP After_Hibernate323_Migration Root_OLAT-2278 Root_OLAT-2278-2 OLAT-2278-2$BP After-commit-of-OLAT-2320-bc-refactoring Before-commit-of-OLAT-2320-bc-refactoring MS01_150507114000 MS01_050607170000 MS01_300507084500 MS01_130607122000 OLAT-HEAD-2438$BP OLAT-HEAD-UZH-2385$BP Root_OLAT-HEAD-UZH-2385 OLAT-5_2_0-MS02-20070626 Root_OLAT-HEAD-2438 OLAT-5_2_0-MS02-20070702 OLAT-5_2_0-MS02-20070703 OLAT-5_2_0-MS02-20070709 OLAT-5_2_0-MS02-20070713 Temp_lavinia_1 Root_OLAT-HEAD-UZH-OLAT_2433 OLAT-HEAD-UZH-OLAT_2433$BP before-merge-5_2_1-to-2433 Temp_lavinia_2 TMP-OLAT-5_2_0-RC03-04-LocalStrings TMP_PB_521_TO_HEAD Root_OLAT-HEAD-BPS-Prototype_CF OLAT-5_2_0-MS02-20070726 Root_OLAT-5_2_x-BRANCH TMP-OLAT-5_2_0-RC04-LocalStrings TMP-OLAT-5_2_0-RC02-LocalStrings OLAT-5_2_x-BRANCH$BP TMP-OLAT-5_2_0-RC01-LocalStrings OLAT-5_2_0-GoldenMaster-20070822 OLAT-5_2_0-FINAL-20070822 TMP-OLAT-5_2_0-TO-HEAD TMP-OLAT-5_2_0-TO-HEAD-2

merge to head

Author:	schnider
Revision:	1.36
Changeset:	MAIN:schnider:20070228094054
Date:	10:41 28 February 2007 (5 years and 2 months)

CS-help

Author:	hjzuber
Revision:	1.35
Changeset:	MAIN:hjzuber:20070223172202
Date:	18:22 23 February 2007 (5 years and 2 months)
Tags:	tmpPbBrasato

OLAT-2045: new tooltip library which will replace overlib soon

Author:	schnider
Revision:	1.34
Changeset:	MAIN:schnider:20061221142541
Date:	15:34 21 December 2006 (5 years and 4 months)
Branch point for:	MAVEN-1865 OLAT-5_0_y-UNIZH-1973 OLAT-5_1_x-BRANCH OLAT-HEAD-JLS-1865
Tags:	MS02_211206181500 OLAT-HEAD-JLS-1865$BP OLAT-5_0_y-UNIZH-1973$BP Root_OLAT-HEAD-JLS-1865 OLAT-HEAD-JLS-1865-beforrefactoring BRASATO_BEFORE_MVN2 Root_MAVEN-1865 MAVEN-1865$BP mergeHeadTo1879 mergeHeadTo1983 tmpMergeToHead1983_1 tmpMergeToHead1879pb tmp0FlexiFormOLAT-5_1_x-BRANCH temp-0-Guido OLAT-5_1_x-BRANCH$BP tmpMergeToHead1983_2 Root_OLAT-5_1_x-BRANCH

adding frentix

Author:	gnaegi
Revision:	1.33
Changeset:	MAIN:gnaegi:20061103142218
Date:	15:22 03 November 2006 (5 years and 6 months)
Branch point for:	OLAT-HEAD-FRENTIX-1979 OLAT-HEAD-JLS-1947 OLAT-HEAD-JLS-1947_2 OLAT-HEAD-JLS-1947_3 OLAT-HEAD-JLS-1973 OLAT-HEAD_UNIZH-1935 OLAT_5_1_-UZH-1983
Tags:	Root_OLAT-HEAD_UNIZH-1935 Root_OLAT_5_1_-UZH-1983 OLAT-HEAD-JLS-1973$BP Root_OLAT-5_1_0-BPS-1879 Root_OLAT-5_1_0-BPS-1914 OLAT-HEAD-JLS-1947$BP OLAT_5_1_-UZH-1983$BP OLAT-HEAD-JLS-1947_2$BP OLAT-HEAD-JLS-1947_3$BP MS01_291106233000 mergeHeadTo1879_1 Root_OLAT-HEAD-JLS-1947_2 Root_OLAT-HEAD-JLS-1973 Root_OLAT-HEAD-JLS-1947_3 TMP_OLAT-1935 OLAT-HEAD-FRENTIX-1979$BP Root_OLAT-HEAD-JLS-1947 mergeHEADto1914 OLAT-HEAD_UNIZH-1935$BP Root_OLAT-HEAD-FRENTIX-1979 OLAT-5-0-y-wiki

updated license information

Author:	schnider
Revision:	1.32
Changeset:	MAIN:schnider:20061017152717
Date:	17:27 17 October 2006 (5 years and 6 months)
Branch point for:	OLAT-5_1_0-BPS-1879 OLAT-5_1_0-BPS-1914 OLAT-HEAD-BPS-Prototype_CF
Tags:	OLAT-5_1_0-BPS-1879$BP OLAT-HEAD-BPS-Prototype_CF-WorkCarsten mergeHeadTo1577 OLAT-HEAD-BPS-Prototype_CF$BP OLAT-5_1_0-BPS-1914$BP TMP-OLAT-5_0_y-BRANCH Root_OLAT-HEAD-JGS-1577

added christian to names

Author:	schnider
Revision:	1.31
Changeset:	MAIN:schnider:20060921085344
Date:	10:53 21 September 2006 (5 years and 7 months)
Branch point for:	OLAT-1847 OLAT-5_0_x-BRANCH OLAT-5_0_y-BRANCH
Tags:	Root_OLAT-5_0_y-BRANCH mergeHeadTo1595 OLAT-5_0_1-GM01-20061013 OLAT-5_0_0-GM02-20060925 OLAT-5_0_0-FINAL-20060926 OLAT-5_0_y-BRANCH$BP OLAT-1847$BP Root_OLAT-5_0_x-BRANCH OLAT-5_0_x-BRANCH$BP OLAT-5_0_1-GM02-20061013 OLAT-5_0_0-GM-20060922 Root_OLAT-1847 merged_OLAT-5_0_x-BRANCH tmpBPS1595 mergeOLAT-5_0_xTo1595 MOVING-OLAT-5_0_y-BRANCH

wording adjusted in accordance with license update (apache 2.0)

Author:	mweber
Revision:	1.30
Changeset:	MAIN:mweber:20060920164609
Date:	18:46 20 September 2006 (5 years and 7 months)

add names

Author:	hjzuber
Revision:	1.29
Changeset:	MAIN:hjzuber:20060908110403
Date:	13:04 08 September 2006 (5 years and 8 months)

OLAT-1574: thanx to Carsten, Gnägi and Zubi can write their names properly

Author:	hjzuber
Revision:	1.28
Changeset:	MAIN:hjzuber:20060706131018
Date:	15:10 06 July 2006 (5 years and 10 months)
Branch point for:	OLAT-4_2_0-BPS-1589 OLAT-HEAD-BPS-1595 OLAT-HEAD-JGS-1577 OLAT-HEAD-JGS-1677 OLAT-HEAD-JGS-1686 OLAT-HEAD-UNIZH-1508
Tags:	merge_tag_1232 OLAT-HEAD-JGS-1577$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1562 CB_as OLAT-4_2_0-BPS-1589$BP OLAT-HEAD-BPS-1595$BP Root_OLAT-4_2_0-BPS-1589 OLAT-HEAD-UNIZH-1508$BP Root_OLAT-HEAD-BPS-1595 mergeHeadTo1508 Root_OLAT-HEAD-UNIZH-1508 Root_OLAT-HEAD-JGS-1677 OLAT-HEAD-JGS-1677$BP OLAT-HEAD-JGS-1686$BP Root_OLAT-HEAD-JGS-1686

OLAT-1574: correct line delimiters for better CVS diffs

Author:	cweisse
Revision:	1.27
Changeset:	MAIN:cweisse:20060706124421
Date:	14:44 06 July 2006 (5 years and 10 months)

check the CVS access (rw) from BPS

* my name corrected ;-)

Author:	cweisse
Revision:	1.26
Changeset:	MAIN:cweisse:20060519183251
Date:	20:32 19 May 2006 (5 years and 11 months)
Branch point for:	OLAT-4_2_0-BPS-1252 OLAT-4_2_0-BPS-1553 OLAT-4_2_0-BPS-1557 OLAT-4_2_0-UNIZH-1530 OLAT-4_2_0-UNIZH-1562 OLAT-4_2_0-UNIZH-890 OLAT-4_2_0-goodsolutions-1232 OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-HEAD-JGS_UNIZH-1509_pbwork
Tags:	OLAT-4_2_0-goodsolutions-1232$BP MERGE_OLAT-JGS_UNIZH-1509_pbwork Root_OLAT-4_2_0-BPS-1557 OLAT-HEAD-JGS_UNIZH-1509_5$BP Root_OLAT-4_2_0-UNIZH-890 Root_OLAT-4_2_0-BPS-1252 Root_OLAT-HEAD-JGS_UNIZH-1509_pbwork OLAT-4_2_0-BPS-1553$BP OLAT-4_2_0-BPS-1553_1 OLAT-4_2_0-BPS-1553_2 OLAT-4_2_0-BPS-1557$BP OLAT-HEAD-START-BRANCH-UNIZH-1562 OLAT-4_2_0-UNIZH-890$BP Root_OLAT-4_2_0-goodsolutions-1232 Before-commit-of-OLAT-869 OLAT-HEAD-START-BRANCH-UNIZH-1530 OLAT-HEAD-JGS_UNIZH-1509_pbwork$BP OLAT-4_2_0-UNIZH-1562$BP Root_OLAT-4_2_0-BPS-1553 Root_OLAT-HEAD-JGS_UNIZH-1509_9 Root_OLAT-HEAD-JGS_UNIZH-1509_8 Root_OLAT-HEAD-JGS_UNIZH-1509_7 Root_OLAT-HEAD-JGS_UNIZH-1509_6 Root_OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-4_2_0-UNIZH-1530$BP OLAT-4_2_0-BPS-1252$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1233

added persons
Ingmar Kroll
Lars Eberle
as code contributers

Author:	Patrick Brunner
Revision:	1.25
Changeset:	MAIN:patrickb:20060301132059
Date:	14:20 01 March 2006 (6 years and 2 months)
Branch point for:	OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH OLAT-4_2_0-UNIZH-1233 OLAT-4_2_0-UNIZH-1480 OLAT-4_2_0-UNIZH-903 OLAT-4_2_0-UNIZH-903_2 olat_4_1_1-goodsolutions-1497 olat_4_1_2-goodsolutions-1509
Tags:	OLAT-4_1_1-PUBLIC-20060323 OLAT-4_1_1-FINAL-20060320 OLAT-4_1_3-FINAL-20060515 OLAT-4_2_0-UNIZH-1480$BP olat_4_1_1-goodsolutions-1497$BP OLAT-4_1_1-GOODSOLUTIONS-1482$BP OLAT-4_1_0-FINAL-20060306 OLAT-4_1_2-FINAL-20060406 Root_olat_4_1_1-goodsolutions-1497 OLAT-4_1_0-GoldenMaster-20060303 OLAT-4_1_2-PUBLIC-20060412 Root_OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH$BP OLAT-4_1_4-FINAL-20060619 OLAT-4_2_0-UNIZH-1233$BP olat_4_1_2-goodsolutions-1509$BP OLAT-4_2_0-UNIZH-903_2$BP Root_OLAT-4_2_0-UNIZH-903_2 Root_olat_4_1_2-goodsolutions-1509 OLAT-HEAD-JGS_UNIZH-1509_3 OLAT-HEAD-JGS_UNIZH-1509_2 OLAT-HEAD-JGS_UNIZH-1509_1 Root_OLAT-4_2_0-UNIZH-903 merge_tag_cg_24-04-06 OLAT-HEAD-START-BRANCH-UNIZH-1233 OLAT-4_2_0-UNIZH-903$BP OLAT-HEAD-JGS_UNIZH-1509_4

licence update. see http://bugzilla.olat.org/jira/browse/OLAT-1313

Author:	stuckia
Revision:	1.24
Changeset:	MAIN:stuckia:20060220124233
Date:	13:42 20 February 2006 (6 years and 2 months)
Branch point for:	OLAT-4_1-GOODSOLUTIONS-1411
Tags:	OLAT-4_1-GOODSOLUTIONS-1411$BP

Merge from OLAT-4_0_2-ZAG Branch

OLAT-1274 (Change password configuration)
OLAT-1254 (Create new file in briefcase)
OLAT-1253 (HTML Editor upgrade to TinyMCE)
OLAT-1279 (Show static resources after login)
OLAT-1290 (Intranet site extension)

Author:	gnaegi
Revision:	1.23
Changeset:	MAIN:gnaegi:20051219145338
Date:	15:53 19 December 2005 (6 years and 4 months)
Branch point for:	OLAT-HEAD_UNIZH-1320
Tags:	Root_OLAT-HEAD_UNIZH-1320 OLAT-HEAD_UNIZH-1320$BP

Adding configuration support for Postgres database
Thanks to Sebastian HennebrŸder for the patches
http://bugs.olat.org/jira/browse/OLAT-1168

Author:	gnaegi
Revision:	1.22
Changeset:	MAIN:gnaegi:20050926114928
Date:	13:49 26 September 2005 (6 years and 7 months)
Branch point for:	OLAT-4-0-x-BRANCH OLAT-4_0_2-BPS OLAT-4_0_2-BPS-1309 OLAT-4_0_2-BPS_UNIZH-1319 OLAT-4_0_2-ZAG
Tags:	OLAT-4_0_0-PUBLIC-20050927 OLAT-4_0_2-PUBLIC-20051108 OLAT-4_0_2-FINAL-20051107 OLAT-MERGE-2-4_0_2-BPS-1309 OLAT-4-0-x-BRANCH$BP OLAT-4_0_2-BPS_UNIZH-1319$BP OLAT-MERGE-1-4_0_2-BPS-1309 OLAT-4_0_1-FINAL-20051017 OLAT-STOP-1288-BPS OLAT-4_0_2-ZAG$BP OLAT-MERGE-3-4_0_2-BPS-1309 OLAT-4_0_2-BPS$BP OLAT-MERGE-3-4_0_2-BPS-1288 OLAT-4_0_2-BPS-1309$BP OLAT-START-1288-BPS OLAT-MERGE-5-4_0_2-BPS-1288 OLAT-MERGE-4-4_0_2-BPS-1288 OLAT-MERGE-2-4_0_2-BPS-1288

corrections of current install docu

Author:	schnider
Revision:	1.21
Changeset:	MAIN:schnider:20050926074613
Date:	9:46 26 September 2005 (6 years and 7 months)

license updates for reload and pfpl stuff

Author:	schnider
Revision:	1.20
Changeset:	MAIN:schnider:20050919115226
Date:	13:52 19 September 2005 (6 years and 7 months)
Tags:	OLAT-4_0_0-GoldenMaster-20050919

updating contributers and license

Author:	gnaegi
Revision:	1.19
Changeset:	MAIN:gnaegi:20050919083019
Date:	10:30 19 September 2005 (6 years and 7 months)

- removed garfield portlet due to copyright issues
- adding macartney comic portlet
http://bugs.olat.org/jira/browse/OLAT-1025

Author:	gnaegi
Revision:	1.18
Changeset:	MAIN:gnaegi:20050824193518
Date:	21:35 24 August 2005 (6 years and 8 months)

Adding the patch from Roberto Bagnoli that implements assessment notifications for qti tests
- http://bugs.olat.org/jira/browse/OLAT-926

Author:	gnaegi
Revision:	1.17
Changeset:	MAIN:gnaegi:20050624125656
Date:	14:56 24 June 2005 (6 years and 10 months)

update

Author:	hjzuber
Revision:	1.16
Changeset:	MAIN:hjzuber:20050406083606
Date:	10:36 06 April 2005 (7 years and 1 month)
Branch point for:	OLAT-3-2-x-BRANCH
Tags:	OLAT-3_2_0-PUBLIC-20050415 Root_OLAT-3-2-x-BRANCH OLAT-3-2-x-BRANCH$BP OLAT-3_2_1-FINAL-20050530

*** empty log message ***

Author:	hjzuber
Revision:	1.15
Changeset:	MAIN:hjzuber:20050330143550
Date:	16:35 30 March 2005 (7 years and 1 month)

smack license added

Author:	schnider
Revision:	1.14
Changeset:	MAIN:schnider:20050214174125
Date:	18:41 14 February 2005 (7 years and 2 months)
Tags:	OLAT-3_2_0-FINAL-20050322 OLAT-3_2_0-GoldenMaster-20050304 OLAT-3_2_0-GoldenMaster2-20050318

hessian.jar not yet needed, may be later

Author:	schnider
Revision:	1.13
Changeset:	MAIN:schnider:20050207160401
Date:	17:04 07 February 2005 (7 years and 3 months)

*** empty log message ***

Author:	schnider
Revision:	1.12
Changeset:	MAIN:schnider:20050118090944
Date:	10:13 18 January 2005 (7 years and 3 months)

adding license for rss4j

Author:	gnaegi
Revision:	1.11
Changeset:	MAIN:gnaegi:20050112170756
Date:	18:07 12 January 2005 (7 years and 4 months)

- new translation style for browsercheck and cookies
- reformatted about page
- adding license to about page

Author:	gnaegi
Revision:	1.10
Changeset:	MAIN:gnaegi:20041210155824
Date:	16:58 10 December 2004 (7 years and 5 months)

adding license stuff

Author:	gnaegi
Revision:	1.9
Changeset:	MAIN:gnaegi:20041209133152
Date:	14:31 09 December 2004 (7 years and 5 months)

*** empty log message ***

Author:	gnaegi
Revision:	1.8
Changeset:	MAIN:gnaegi:20041018164513
Date:	18:45 18 October 2004 (7 years and 6 months)

adding infos about other licenses

Author:	gnaegi
Revision:	1.7
Changeset:	MAIN:gnaegi:20041010220621
Date:	0:06 11 October 2004 (7 years and 7 months)
Branch point for:	OLAT-3-1-x-BRANCH
Tags:	OLAT-3-1-x-BRANCH$BP OLAT-3_1_1-FINAL-20041012 OLAT-3_1_2-FINAL-20041013

adding jscalendar license notes (LGPL)

Author:	gnaegi
Revision:	1.6
Changeset:	MAIN:gnaegi:20041005112558
Date:	13:25 05 October 2004 (7 years and 7 months)

add gs, pb

Author:	stuckia
Revision:	1.5
Changeset:	MAIN:stuckia:20040721130931
Date:	15:09 21 July 2004 (7 years and 9 months)
Tags:	OLAT-3_0_1-FINAL-20040804 OLAT-3_1_0-FINAL-20040921

*** empty log message ***

Author:	hjzuber
Revision:	1.4
Changeset:	MAIN:hjzuber:20040721102331
Date:	12:23 21 July 2004 (7 years and 9 months)

*** empty log message ***

Author:	mike
Revision:	1.3
Changeset:	MAIN:mike:20040708172324
Date:	19:23 08 July 2004 (7 years and 10 months)
Tags:	OLAT-3_0_0-FINAL-20040713

*** keyword substitution change ***

Author:	mike
Revision:	1.2
Changeset:	MAIN:mike:20040517155105
Date:	17:53 17 May 2004 (7 years and 11 months)

Fresh, clean checkin

Author:	mike
Revision:	1.1
Changeset:	MAIN:mike:20040517151152
Date:	17:12 17 May 2004 (7 years and 11 months)

new

First step from ant to maven
brasato 1865 builds with maven

maven -> produces a war file -> copy paste to tomcat and it starts

Author:	Patrick Brunner
Revision:	1.34.8.1
Changeset:	MAVEN-1865:patrickb:20070313212104
Date:	22:23 13 March 2007 (5 years and 2 months)

deleted

Merge from HEAD

Author:	mike
Revision:	1.7.2.1
Changeset:	OLAT-3-1-x-BRANCH:mike:20041020084538
Date:	10:45 20 October 2004 (7 years and 6 months)
Tags:	OLAT-3_1_4-FINAL-20041117 OLAT-3_1_3-FINAL-20041020

Adding overlib again, still needed
http://bugs.olat.org/jira/browse/OLAT-1253

Author:	gnaegi
Revision:	1.22.6.2
Changeset:	OLAT-4_0_2-ZAG:gnaegi:20051214182913
Date:	19:29 14 December 2005 (6 years and 5 months)
Tags:	OLAT-1253-html-editor-finished

- removed textual Kupu references
- removed overlib library and textual references
- enabled context sensitive menu for IE

OLAT-1253

Author:	gnaegi
Revision:	1.22.6.1
Changeset:	OLAT-4_0_2-ZAG:gnaegi:20051214101646
Date:	11:16 14 December 2005 (6 years and 5 months)

OLAT-1482 ajax -ify olat
work in progress!

Author:	fjost
Revision:	1.24.2.1
Changeset:	OLAT-4_1-GOODSOLUTIONS-1411:fjost:20060331114232
Date:	13:42 31 March 2006 (6 years and 1 month)

OLAT-1233:Merge HEAD into branch-1233

Author:	guretzki
Revision:	1.25.10.1
Changeset:	OLAT-4_2_0-UNIZH-1233:guretzki:20060522163057
Date:	18:31 22 May 2006 (5 years and 11 months)

merge HEAD into BRANCH-1530

Author:	Alexander Schneider
Revision:	1.26.2.1
Changeset:	OLAT-4_2_0-UNIZH-1530:asch:20060725092736
Date:	11:27 25 July 2006 (5 years and 9 months)

OLAT-1562: Work in progress; Merge HEAD into branch.

Author:	guretzki
Revision:	1.26.12.1
Changeset:	OLAT-4_2_0-UNIZH-1562:guretzki:20060711091244
Date:	11:12 11 July 2006 (5 years and 10 months)

merges from HEAD

Author:	gnaegi
Revision:	1.26.4.1
Changeset:	OLAT-4_2_0-goodsolutions-1232:gnaegi:20060721170930
Date:	19:10 21 July 2006 (5 years and 9 months)

merged from HEAD to OLAT-5_0_y-BRANCH

Author:	Alexander Schneider
Revision:	1.31.6.2
Changeset:	OLAT-5_0_y-BRANCH:asch:20061103170339
Date:	18:03 03 November 2006 (5 years and 6 months)
Tags:	OLAT-5_0_2-GC-20061120 OLAT-5_0_2-FINAL-20061108 OLAT-5_0_3-FINAL-20061218

updated license information

Author:	schnider
Revision:	1.31.6.1
Changeset:	OLAT-5_0_y-BRANCH:schnider:20061017152702
Date:	17:27 17 October 2006 (5 years and 6 months)
Tags:	OLAT-5_0_1-FINAL-20061017 OLAT-5_0_1-PUBLIC-20061019

merge Head to Branch
(
target: HEAD
common source: mergeHeadTo1879_1
)

Author:	Patrick Brunner
Revision:	1.32.2.2
Changeset:	OLAT-5_1_0-BPS-1879:patrickb:20070129231527
Date:	0:15 30 January 2007 (5 years and 3 months)

OLAT-1879

Merge HEAD into Branch 1879

Author:	leberle
Revision:	1.32.2.1
Changeset:	OLAT-5_1_0-BPS-1879:leberle:20061116144520
Date:	15:45 16 November 2006 (5 years and 5 months)

OLAT-1914

Merge HEAD to Branch

Author:	leberle
Revision:	1.32.6.1
Changeset:	OLAT-5_1_0-BPS-1914:leberle:20061103150659
Date:	16:07 03 November 2006 (5 years and 6 months)

updated license

Author:	schnider
Revision:	1.34.6.2
Changeset:	OLAT-5_1_x-BRANCH:schnider:20070227171252
Date:	18:12 27 February 2007 (5 years and 2 months)
Tags:	OLAT-5_1_2-PUBLIC-20070403 OLAT-5_1_0-FINAL-20070228 OLAT-5_1_3-PUBLIC-20070507 OLAT-5_1_3-FINAL-20070423 OLAT-5_1_1-FINAL-20070313

MERGE HEAD TO BRANCH

Author:	Alexander Schneider
Revision:	1.34.6.1
Changeset:	OLAT-5_1_x-BRANCH:asch:20070226154834
Date:	16:48 26 February 2007 (5 years and 2 months)
Tags:	OLAT-5_1_0-GM-20070227

license updates

Author:	schnider
Revision:	1.37.12.2
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070903155115
Date:	17:51 03 September 2007 (4 years and 8 months)
Branch point for:	OLAT-5_2_x-BRANCH-2729
Tags:	OLAT-5_2_1-FINAL-20070911 OLAT-5_2_1-GoldenMaster-20070911 Merged-5_2_2-20070927-Into-HEAD OLAT-5_2_2-PUBLIC-20070913 OLAT-5_2_3-FINAL-20071119 OLAT-5_2_3-PUBLIC-20071120 OLAT-5_2_4-FINAL-20080310 OLAT-5_2_1-PUBLIC-20070912 OLAT-5_2_4-RC01-20080228 Root_OLAT-5_2_x-BRANCH-2729 OLAT-5_2_x-BRANCH-2729$BP OLAT-5_2_4-RC02-20080306

license updates

Author:	schnider
Revision:	1.37.12.1
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070830170437
Date:	19:04 30 August 2007 (4 years and 8 months)

key changes for context sensitive help

Author:	hjzuber
Revision:	1.39.2.1
Changeset:	OLAT-6_0_x-BRANCH:hjzuber:20080601165927
Date:	18:59 01 June 2008 (3 years and 11 months)
Branch point for:	OLAT-6_0_1-MAINTENANCE
Tags:	OLAT-6_0_0-PUBLIC-20080604 OLAT-6_0_1-RC01-20080619 OLAT-6_0_1-RC03-20080627 OLAT-6_0_1-RC02-20080623 OLAT-6_0_3-PUBLIC-20080820 OLAT-6_0_3-RC01-20080731 OLAT-6_0_2-MAINTENANCE-20080723 OLAT-6_0_4-RC04-20080908 OLAT-6_0_6-PUBLIC-20081120 before_merge_HEAD_emergency_into_6_0_x_BRANCH OLAT-6_0_1-RC05-20080708 OLAT-6_0_5-RC02-20080925 OLAT-6_0_1-RC04-20080703 OLAT-6_0_4-FINAL-20080909 OLAT-6_0_1-FINAL-20080714 OLAT-6_0_1-GM-20080711 OLAT-6_0_4-RC01-20080924 OLAT-6_0_6-FINAL-20081117 OLAT-6_0_3-MERGE_TO_HEAD OLAT-6_0_3_CR02-20080805 OLAT-6_0_5-FINAL-20081010 OLAT-6_0_5-FINAL-20081008 OLAT-6_0_4-RC03-20080908 OLAT-6_0_1-RC06-20080710 OLAT-6_0_1-MAINTENANCE$BP OLAT-6_0_5-RC01-20080924 OLAT-6_0_3-FINAL-20080812 OLAT-6_0_3-FINAL-20080819 OLAT-6_0_5-RC03-20081003 OLAT-6_0_5-RC04-20081006 OLAT-6_0_4-RC02-20080904 OLAT-6_0_4-RC01-20080902 OLAT-6_0_7-FINAL-20081201 OLAT-6_0_7-RC01-20081126 OLAT-6_0_7-PUBLIC-20081203

updating contributers

Author:	gnaegi
Revision:	1.42.4.1
Changeset:	OLAT-6_1_x-BRANCH:gnaegi:20090504083346
Date:	10:33 04 May 2009 (3 years)
Tags:	OLAT-6_1_1-PUBLIC-20090513

MERGE with HEAD

Author:	skoeber
Revision:	1.44.4.1
Changeset:	OLAT-6_2-BPS-4072:skoeber:20090818113953
Date:	13:40 18 August 2009 (2 years and 8 months)

head merged

Author:	bja
Revision:	1.40.2.1
Changeset:	OLAT-HEAD-BPS-1229:bja:20090203084902
Date:	9:49 03 February 2009 (3 years and 3 months)

OLAT-1595 : mergeOLAT-5_1_xToBranch

Author:	ikroll
Revision:	1.28.8.2
Changeset:	OLAT-HEAD-BPS-1595:ikroll:20070615115732
Date:	14:00 15 June 2007 (4 years and 11 months)

http://bugs.olat.org/jira/browse/OLAT-1595
OLAT-1595: Merge HEAD into BRANCH
(work in progress)

Author:	ikroll
Revision:	1.28.8.1
Changeset:	OLAT-HEAD-BPS-1595:ikroll:20061005081214
Date:	10:13 05 October 2006 (5 years and 7 months)
Tags:	beforeMerge-BPS-1595

OLAT-2434 Merging HEAD to CF branch, adding database migration script. There are some classes I had to patch in the core to make this branch work, I will commit them directly to HEAD when merging the branch back to HEAD, so this branch will not compile out of the box.

Author:	gnaegi
Revision:	1.32.4.2
Changeset:	OLAT-HEAD-BPS-Prototype_CF:gnaegi:20080106182601
Date:	19:28 06 January 2008 (4 years and 4 months)

OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes

Author:	gnaegi
Revision:	1.32.4.1
Changeset:	OLAT-HEAD-BPS-Prototype_CF:gnaegi:20070717141024
Date:	16:15 17 July 2007 (4 years and 9 months)

OLAT-3766 cpeditor: Update BRANCH from HEAD

Author:	gwassmann
Revision:	1.41.2.2
Changeset:	OLAT-HEAD-FRENTIX-3766-CPEDITOR:gwassmann:20090518135813
Date:	16:00 18 May 2009 (2 years and 11 months)

OLAT-3766 Merge from HEAD to IMS CP editor branch

Author:	gnaegi
Revision:	1.41.2.1
Changeset:	OLAT-HEAD-FRENTIX-3766-CPEDITOR:gnaegi:20090209174409
Date:	18:44 09 February 2009 (3 years and 3 months)

OLAT-3946 Podcast. Merge from HEAD

Author:	gwassmann
Revision:	1.42.8.3
Changeset:	OLAT-HEAD-FRENTIX-3946-Podcast:gwassmann:20090818074806
Date:	9:48 18 August 2009 (2 years and 8 months)
Tags:	mergePodcast3946ToHead

OLAT-3946 update from HEAD

Author:	gwassmann
Revision:	1.42.8.2
Changeset:	OLAT-HEAD-FRENTIX-3946-Podcast:gwassmann:20090727101146
Date:	12:17 27 July 2009 (2 years and 9 months)

OLAT-3946 podcast: merge from head and some other changes

Author:	gwassmann
Revision:	1.42.8.1
Changeset:	OLAT-HEAD-FRENTIX-3946-Podcast:gwassmann:20090610100935
Date:	12:11 10 June 2009 (2 years and 11 months)

OLAT-5494: merge head to epf-branch: olat3

Author:	rhaag
Revision:	1.47.10.1
Changeset:	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO:rhaag:20100909143517
Date:	16:35 09 September 2010 (20 months)

Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD

Author:	gnaegi
Revision:	1.28.2.1
Changeset:	OLAT-HEAD-JGS-1577:gnaegi:20061103100306
Date:	11:04 03 November 2006 (5 years and 6 months)

merge 5.2.1 from HEAD to 2433
tested locally

Author:	Patrick Brunner
Revision:	1.37.8.1
Changeset:	OLAT-HEAD-UZH-OLAT_2433:patrickb:20070907195137
Date:	21:51 07 September 2007 (4 years and 8 months)

OLAT-3674: merge head to branch

Author:	rhaag
Revision:	1.40.4.2
Changeset:	OLAT-HEAD_FRENTIX-3674:rhaag:20090528140628
Date:	16:07 28 May 2009 (2 years and 11 months)

merge Head to branch, part2

Author:	rhaag
Revision:	1.40.4.1
Changeset:	OLAT-HEAD_FRENTIX-3674:rhaag:20090112094447
Date:	10:44 12 January 2009 (3 years and 4 months)

- intermediate save
- merge HEAD into Branch

Author:	Patrick Brunner
Revision:	1.33.12.1
Changeset:	OLAT_5_1_-UZH-1983:patrickb:20070117200600
Date:	21:06 17 January 2007 (5 years and 3 months)

merge with head

Author:	schnider
Revision:	1.45.16.1
Changeset:	tmpOLAT-HEAD-640-until-2010-03-10:schnider:20100127094038
Date:	10:47 27 January 2010 (2 years and 3 months)
Branch point for:	OLAT-6_4_0-BPS-Incubation
Tags:	tmp-OLAT-HEAD-640-1 Root_OLAT-6_4_0-BPS-Incubation OLAT-6_4_0-BPS-Incubation$BP