From 50172ba2fd50ded9db0d8564ce9b47ff1c2e4ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verine=20QUEUNE?= <severine.queune@bulac.fr>
Date: Wed, 21 Oct 2020 18:13:30 +0200
Subject: [PATCH] Bug 25700 - Complete KohCons informations in timeline

Last entry for KohaCons on Koha timeline was for 2013.
This patch :
- adds KohaCons from 2014 to 2020
- adds missing link to KohaCons websites for events from 2006 to 2013
- suppress dead links for old KohaCons
- standardizes the display of informations

To test, apply patch and check :
- there is no typo (especially for October > Octobre)
- order of dates are correct
- links to Koha website ou wiki are correct
---
 docs/history.txt | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index da0d955..1044fc8 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -295,8 +295,8 @@ Epoch	Date	Description	Tags
 1143158400	March 24 2006	Joshua Ferraro has revised his document about installing Koha on Debian to accommodate Koha version 2.2.6 and Debian sarge (3.1). Find it on www.kohadocs.org under "System Administration."	documentation
 1144022400	April  3 2006	Developer meeting on IRC
 1144701589	April 10 2006	Tümer Garip becomes the 42nd committer to Koha (major influence in the addition of zebra to Koha and other)	developer
-1144972800	April 14 2006	Pierrick Le Gall begins as translation manager
-1146528000	May 2,3 2006	Kohacon in Paris http://www.koha.org/community/conferences/
+1144972800	April 14 2006	Pierrick Le Gall begins as translation managerp
+1146528000	May 2-3 2006	KohaCon06 in Paris, France
 1147392001	May 12-18 2006	Developers week at Bibliotheque du Centre de Mathematiques et Informatique (CMI) at the Universite de Provence, in Marseille
 1147427151	May 12 2006	Bruno Toumi becomes the 43rd committer to Koha	developer
 1148032374	May 19 2006	Arnaud Laurin becomes the 44th committer to Koha	developer
@@ -412,8 +412,7 @@ Epoch	Date	Description	Tags
 1236816000	March 12 2009	Vladimir Mircevski working on a Serbian translation	translation, serbian
 1236816001	March 12 2009	Biblibre start work on a connector for SOPAC (the social opac) and Koha
 1239235200	April  9 2009	Delhi public Library opens its first computerised sub branch at Vinobha Puri http://www.newdelhinews.net/story/487886	India
-1239840000	April 16-17 2009	Kohacon 2009 in Plano, Texas, USA
-1240012800	April 18-20 2009	Developer conference/hackfest Plano, Texas, USA
+1239840000	April 16-20 2009	KohaCon09 and hackfest in Plano, Texas, USA - https://wiki.koha-community.org/wiki/KohaCon2009
 1240012801	April 18 2009	Brendan A. Gallagher narrowly beats Jane to become the 82nd committer	developer
 1240086358	April 18 2009	Jane Wagner becomes the 82nd committer	developer
 1240089404	April 18 2009	Brendan Gallagher becomes the 83rd committer to Koha	developer
@@ -509,7 +508,7 @@ Epoch	Date	Description	Tags
 1286366636	October  6 2010	Eric Olsen becomes the 119th committer to have a patch accepted	developer
 1287337626	October 17 2010	Bernardo González Kriegel becomes the 120th developer to have a patch pushed	developer
 1287727642	October 22 2010	Koha 3.02.00 released	releases
-1287964800	October 25-31 2010	Kohacon10 in Wellington
+1287964800	October 25-31 2010	KohaCon10 and hackfest in Wellington, New Zealand - https://koha-community.org/kohacon10-videos/
 1288474349	October 30 2010	Brian Engard becomes the 121st committer to have a patch accepted	developer
 1288474415	October 30 2010	Daniel Grobani becomes the 122nd committer to have a patch accepted	developer
 1288516607	October 31 2010	Nate Curulla becomes the 123rd committer to have a patch accepted	developer
@@ -587,7 +586,7 @@ Epoch	Date	Description	Tags
 1317772800	October  5 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_5_October_2011
 1318640424	October 15 2011	Greg Barniskis becomes the 165th developer to have a patch pushed	developer
 1319232373	October 21 2011	Koha 3.06.00 released	releases
-1320019200	October 31 2011	4th KohaCon in Mumbaï, India
+1320019200	October 31 - November 6 2011	KohaCon11 in Thane, India - http://wiki.koha-community.org/wiki/KohaCon11_Thane,_India
 1320864858	November  9 2011	Koha 3.04.06 released	releases
 1321833600	November 21 2011	Plea for help from Horowhenua Library Trust (Koha TM in NZ)
 1322529619	November 29 2011	Koha 3.06.01 released	releases
@@ -621,9 +620,8 @@ Epoch	Date	Description	Tags
 1337632593	May 21 2012	Koha 3.08.01 released	releases
 1337950322	May 25 2012	Koha 3.06.05 released	releases
 1338196467	May 28 2012	Simon Story becomes the 186th developer to have a patch pushed	developer
-1338854400	June 5-7 2012	Kohacon12 in Edinburgh
 1338904387	June  5 2012	Piotr Kowalski becomes the 187th developer to have a patch pushed	developer
-1339200000	June 9-11 2012	Kohacon12 hackfest in Edinburgh
+1339200000	June 5-11 2012	KohaCon12 and hackfest in Edinburgh, Scotland - https://koha-community.org/kohacon/kohacon12/
 1339317367	June 10 2012	Shari Perkins becomes the 188th developer to have a patch pushed	developer
 1340219266	June 20 2012	Claire Hernandez becomes the 189th developer to have a patch pushed	developer
 1340312763	June 21 2012	Koha 3.08.02 released	releases
@@ -703,7 +701,7 @@ Epoch	Date	Description	Tags
 1379942516	September 23 2013	Koha 3.12.05 released	releases
 1380725568	October  2 2013	Ketan Kulkarni becomes the 226th developer to have a patch pushed	developer
 1381296323	October  9 2013	Philippe Blouin becomes the 227th developer to have a patch pushed	developer
-1381881600	October 16-22 2013	KohaCon 2013 and hackfest in Reno, Nevada, USA
+1381881600	October 16-22 2013	KohaCon13 and hackfest in Reno, Nevada, USA - https://koha-community.org/kohacon/kohacon13/
 1382401633	October 22 2013	Raewyn Adams becomes the 228th developer to have a patch pushed	developer
 1382401748	October 22 2013	Sue Tunnicliff becomes the 229th developer to have a patch pushed	developer
 1382401764	October 22 2013	Katherine Chisholm becomes the 230th developer to have a patch pushed	developer
@@ -781,6 +779,7 @@ Epoch	Date	Description	Tags
 1409923290	September  5 2014	Charles Farmer becomes the 272nd developer to have a patch pushed	developer
 1412200637	October  1 2014	Koha 3.16.04 released	releases
 1412253520	October  2 2014	Koha 3.14.11 released	releases
+1603293825	October 6-11 2014	KohaCon14 and hackfest in Cordoba, Argentina - https://koha-community.org/kohacon/kohacon14/
 1412945573	October 10 2014	Koha 3.12.15 released	releases
 1414776298	October 31 2014	Maxime Beaulieu becomes the 273rd developer to have a patch pushed	developer
 1416150905	November 16 2014	Héctor Eduardo Castro Avalos becomes the 274th developer to have a patch pushed	developer
@@ -844,6 +843,7 @@ Epoch	Date	Description	Tags
 1443652323	September 30 2015	Koha 3.18.11 released	releases
 1443851741	October  3 2015	Koha 3.16.15 released	releases
 1444059211	October  5 2015	Remi Mayrand-Provencher becomes the 301st developer to have a patch pushed	developer
+1603294377	October 19-25 2015 	KohaCon15 and hackfest in Ibadan, Nigeria - https://koha-community.org/kohacon/kohacon15/
 1445522767	October 22 2015	Ahmed becomes the 302nd developer to have a patch pushed	developer
 1445978530	October 27 2015	Koha 3.20.05 released	releases
 1446420450	November  1 2015	Koha 3.18.12 released	releases
@@ -871,6 +871,7 @@ Epoch	Date	Description	Tags
 1462370617	May  4 2016	Francois Charbonnier becomes the 309th developer to have a patch pushed	developer
 1464172266	May 25 2016	Koha 3.22.07 released	releases
 1464289776	May 26 2016	Koha 16.05.00 released	releases
+1603294476	May 30 - June 4 2016	KohaCon16 and hackfest in Thessaloniki, Greece - http://koha-community.org/kohacon/kohacon16/
 1464951863	June  3 2016	Claire Gravely becomes the 310th developer to have a patch pushed	developer
 1465033844	June  4 2016	Rocio Dressler becomes the 311th developer to have a patch pushed	developer
 1465043758	June  4 2016	Aliki Pavlidou becomes the 312th developer to have a patch pushed	developer
@@ -950,6 +951,7 @@ Epoch	Date	Description	Tags
 1496023921	May 29 2017	Leire Diez becomes the 346th developer to have a patch pushed	developer
 1496113764	May 30 2017	Koha 17.05.00 released	releases
 1497335098	June 13 2017	Koha 16.05.14 released	releases
+1603294578	June 19-23 2017	KohaCon17 and hackfest in Philippines - https://koha-community.org/kohacon/kohacon17/
 1498124073	June 22 2017	Koha 16.11.09 released	releases
 1498204383	June 23 2017	Koha 17.05.01 released	releases
 1501157429	July 27 2017	Koha 17.05.02 released	releases
@@ -1023,6 +1025,7 @@ Epoch	Date	Description	Tags
 1535121851	August 24 2018	Koha 18.05.03 released	releases
 1535127806	August 24 2018	Maryse Simard becomes the 379th developer to have a patch pushed	developer
 1535464924	August 28 2018	Koha 17.11.09 released	releases
+1603294719	September 10-16 2018	KohaCon18 and hackfest in Portland, Oregon, USA - https://koha-community.org/kohacon/kohacon18/
 1537056051	September 16 2018	Caroline Cyr La Rose becomes the 380th developer to have a patch pushed	developer
 1537364738	September 19 2018	Jane Sandberg becomes the 381st developer to have a patch pushed	developer
 1537794917	September 24 2018	Koha 18.05.04 released	releases
@@ -1071,6 +1074,7 @@ Epoch	Date	Description	Tags
 1556537618	April 29 2019	Koha 18.11.05 released	releases
 1556634207	April 30 2019	Koha 17.11.18 released	releases
 1556801347	May  2 2019	Koha 18.05.12 released	releases
+1603294912	May 20-26 2019	KohaCon19 and wokshop in Dublin, Ireland - https://koha-community.org/kohacon/kohacon19/
 1558623387	May 23 2019	Henry Bolshaw becomes the 403rd developer to have a patch pushed	developer
 1559230147	May 30 2019	Koha 19.05.00 released	releases
 1559285796	May 31 2019	Koha 18.11.06 released	releases
@@ -1139,3 +1143,4 @@ Epoch	Date	Description	Tags
 1597785404	August 18 2020	Koha 19.11.09 released	releases
 1598360638	August 25 2020	Koha 19.05.14 released	releases
 1598907821	August 31 2020	Koha 20.05.03 released	releases
+1603281939	October 19-25 2020	KohaCon20 and hackfest in Wellington, New Zealand - https://koha-community.org/kohacon/kohacon20/
-- 
2.1.4