Bug 7143 : Updating history and about page

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Checked the names with git log and Bugzilla.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/docs/history.txt b/docs/history.txt
index 9cca45f..f28bc1e 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -767,9 +767,12 @@ July 25 2014       Natalie Bennison becomes the 257th developer to have a patch pushed
 July 25 2014   Brian Norris becomes the 258th developer to have a patch pushed
 July 25 2014   Karl Menzies becomes the 259th developer to have a patch pushed
 July 25 2014   Evonne Cheung becomes the 260th developer to have a patch pushed
-July 25 2014   Sean Hamlin becomes the 261sth developer to have a patch pushed
+July 25 2014   Sean Hamlin becomes the 261st developer to have a patch pushed
+July 29 2014   Maxime Beaulieu becomes the 262nd developer to have a patch pushed
 July 25 2014   Koha 3.12.14 released   releases
 July 25 2014   Koha 3.14.9 released    releases
+August 6 2014  Charles Farmer becomes the 263rd developer to have a patch pushed
 August 26 2014 Koha 3.16.3 released    releases
-September 4 2014       Janet McGowan becomes the 262nd developer to have a patch pushed
+September 4 2014       Janet McGowan becomes the 264th developer to have a patch pushed
 September 4 2014       Koha 3.14.10 released   releases
+November 17 2014       Héctor Eduardo Castro Avalos becomes the 265th developer to have a patch pushed

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 3d2ac1a..30822f1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -310,6 +310,7 @@
                 <li>Alex Arnaud</li>
                 <li>Petter Goksoyr Asen</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
+                <li>Héctor Eduardo Castro Avalos</li>
                 <li>Larry Baerveldt</li>
                 <li>Marc Balmer</li>
                 <li>Edmund Balnaves</li>
@@ -320,6 +321,7 @@
                 <li>Greg Barniskis</li>
                 <li>Benedykt P. Barszcz (Polish for 2.0)</li>
                 <li>D Ruth Bavousett</li>
+                <li>Maxime Beaulieu</li>
                 <li>Natalie Bennison</li>
                 <li>John Beppu</li>
                 <li>Pablo Bianchi</li>
@@ -378,6 +380,7 @@
                 <li>Jason Etheridge</li>
                 <li>Shaun Evans</li>
                 <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
+                <li>Charles Farmer</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
                 <li>Vitor Fernandes</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>