Attachment 4304 Details for Bug 6429 – Patch 2/3

[patch] Patch 2/3

patch.txt (text/plain), 6.77 KB, created by Marcel de Rooy on 2011-05-30 12:01:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2011-05-30 12:01:49 UTC

Size: 6.77 KB

patch

obsolete

>From 94c65c58b27cb07be84112df6d94e4256338edc2 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 30 May 2011 13:40:58 +0200
>Subject: [PATCH 2/3] 6429: Sync history/about
>Content-Type: text/plain; charset="utf-8"
>
>Adding new developers (including myself :-)
>Adding Rijksmuseum.
>---
> docs/history.txt                                 |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |   25 +++++++++++++++++++++-
> 2 files changed, 25 insertions(+), 2 deletions(-)
>
>diff --git a/docs/history.txt b/docs/history.txt
>index b2df084..f33f90c 100644
>--- a/docs/history.txt
>+++ b/docs/history.txt
>@@ -296,7 +296,7 @@ April 3	2006	Developer meeting on IRC
> April 11 2006	 TÃ¼mer Garip becomes the 40th committer to Koha (major influence in the addition of zebra to Koha and other)
> April 14 2006	Pierrick Le Gall begins as translation manager
> May 2,3 2006	 Kohacon in Paris http://www.koha.org/community/conferences/
>-May 12 2006	 Bruno Tuomi (from San Ouest Provence) becomes the 41st committer to Koha
>+May 12 2006	 Bruno Toumi (from San Ouest Provence) becomes the 41st committer to Koha
> May 12-18 2006	 Developers week at Bibliotheque du Centre de Mathematiques et Informatique (CMI) at the Universite de Provence, in Marseille
> May 19 2006	 Arnaud Laurin (also from SAN-OP) becomes the 42nd committer to Koha
> May 31 2006	First email from Mike Hafen to the devel list
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index 5ca2e68..a8bb418 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>@@ -114,9 +114,12 @@
>             <h2>Koha Development Team</h2>
> 			<ul>
>                 <li>Md. Aftabuddin</li>
>+		<li>Edward Allen</li>
>                 <li>Francisco M. Marzoa Alonso</li>
>                 <li>Cindy Murdock Ames</li>
>+                <li>Richard Anderson</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
>+		<li>TomÃ¡s Cohen Arazi</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
>                 <li>Alex Arnaud</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
>@@ -135,37 +138,47 @@
>                 <li>DeAndre Carroll</li>
>                 <li>Chris Catalfo (new plugin MARC editor)</li>
>                 <li>Marc Chantreux</li>
>+                <li>Andrew Chilton</li>
>                 <li>Garry Collum</li>
>+		<li>Christophe Croullebois</li>
>+                <li>Nate Curulla</li>
>                 <li>Vincent Danjean</li>
>                 <li>Kip DeGraaf</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">FrÃ©dÃ©ric Demians</a></li>
>+		<li>Serhij Dubyk</li>
>                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
>                 <li>Sebastiaan Durand</li>
>                 <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
>                 <li>Stephen Edwards</li>
>                 <li>Andrew Elwell</li>
>+                <li>Brian Engard</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
>                 <li>Esiee School (JÃ©rome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
>+		<li>Shaun Evans</li>
>                 <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
>                 <li>Clay Fouts</li>
>                 <li>Marco Gaiarin</li>
>+                <li>Pierrick Le Gall</li>
>                 <li>Brendan A. Gallagher</li>
>                 <li>Tumer Garip</li>
>                 <li>Russel Garlick</li>
>                 <li>Daniel Kahn Gillmor</li>
>                 <li>David Goldfein</li>
>+                <li>Daniel Grobani</li>
>                 <li>Amit Gupta</li>
>                 <li>Michael Hafen</li>
>                 <li>Mike Hansen</li>
>                 <li>Brian Harrington</li>
>+                <li>Friedrich zur Hellen</li>
>                 <li>Michaes Herman</li>
>                 <li>Wolfgang Heymans</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
>                 <li>SÃ¨bastien Hinderer</li>
>                 <li>Daniel Holth</li>
>                 <li>Andrew Hooper</li>
>+                <li>Matthew Hunt</li>
>                 <li>Christopher Hyde</li>
>                 <li>Cory Jaeger</li>
>                 <li>Srdjan Jankovic</li>
>@@ -183,16 +196,25 @@
>                 <li>Brig C. McCoy</li>
>                 <li>Dorian Meid (German translation)</li>
>                 <li>Matthias Meusburger</li>
>+                <li>Alan Millar</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
>                 <li>Sharon Moreland</li>
>                 <li>Nicolas Morin</li>
>  		<li>Mike Mylonas</li>
>                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
>+		<li>Eric Olsen</li>
>+		<li>H. Passini</li>
>+		<li>Dobrica Pavlinusic</li>
>                 <li>Polytechnic University</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
>                 <li>Liz Rea</li>
>                 <li>Allen Reinmeyer</li>
>+                <li>Serge Renaux</li>
>+                <li>Waylon Robertson</li>
>+                <li>Marcel de Rooy</li>
>+		<li>Brice Sanchez</li>
>                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
>+		<li>Zach Sim</li>
>                 <li>Savitra Sirohi</li>
>                 <li>Pawel Skuza (Polish for 1.2)</li>
>                 <li>Southeastern University</li>
>@@ -219,7 +241,7 @@
>                 <li>James Winter</li>
>                 <li>Lars Wirzenius</li>
> 			</ul>
>-            <h3>Contributing Companies</h3>
>+            <h3>Contributing Companies and Institutions</h3>
>             <ul>
>                 <li><strong>BibLibre</strong>, France</li>
>                 <li><strong>Bibliotheksservice-Zentrum Baden-WÃ¼rttemberg (BSZ)</strong>, Germany</li>
>@@ -232,6 +254,7 @@
> 		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
> 		<li><strong>PTFS</strong>, Maryland, USA</li>
> 		<li><strong>PTFS Europe Ltd</strong>, United Kingdom</li>
>+		<li><strong>Rijksmuseum</strong>, Amsterdam, The Netherlands</li>
> 		<li><strong>SAN-Ouest Provence</strong>, France</li>
> 		<li><strong>Software Coop</strong>, United Kingdom</li>
> 		<li><strong>Tamil</strong>, France</li>
>-- 
>1.6.0.6
>

Actions: View | Diff | Splinter Review

Attachments on bug 6429: 4303 | 4304 | 4305 | 4306