From 743d3af3c52f21a47795b76598b0136ad261839a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 6 Jan 2017 12:06:39 +0100 Subject: [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2 PHPBB3-14961 --- phpBB/docs/CREDITS.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 26ff8fcc80..2df7543ce1 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -75,9 +75,7 @@ Major contributions by: leviatan21 (Gabriel Vazquez) Visual Confirmation: Xore (Robert Hetzler) -Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Limited prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited -subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited phpBB contains code from the following applications: @@ -99,4 +97,5 @@ Pear (c) 2001-2004 PHP Group, http://pear.php.net Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff MIT licenced: -Symfony2 (c) 2004-2011 Fabien Potencier, http://symfony.com/ +Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/ +Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com -- cgit v1.2.1 From 57323d1650fdc39c6e4ba8e4ba44b4919f6037cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= Date: Mon, 20 Nov 2017 15:54:52 +0100 Subject: [ticket/15461] Add Derky to the list of contributors. PHPBB3-15461 --- phpBB/docs/CREDITS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 2df7543ce1..b68281d15c 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -26,9 +26,9 @@ phpBB Lead Developer: Marc (Marc Alexander) phpBB Developers: bantu (Andreas Fischer) CHItA (Máté Bartus) + Derky (Derk Ruitenbeek) Elsensee (Oliver Schramm) Nicofuma (Tristan Darricau) - prototech (Cesar Gallegos) For a list of phpBB Team members, please see: http://www.phpbb.com/about/team/ @@ -61,6 +61,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] kellanved (Henry Sudhof) [04/2007 - 03/2011] nickvergessen (Joas Schilling)[04/2010 - 12/2015] Oleg (Oleg Pudeyev) [01/2011 - 05/2013] + prototech (Cesar Gallegos) [01/2014 - 12/2016] rxu (Ruslan Uzdenov) [04/2010 - 12/2012] TerraFrost (Jim Wigginton) [04/2009 - 01/2011] ToonArmy (Chris Smith) [06/2008 - 11/2011] -- cgit v1.2.1 From d6d77a199bb754091733225413a0b6e749b5aadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= Date: Thu, 23 Nov 2017 09:16:54 +0100 Subject: [ticket/15463] Add MichaelC and Hanakin to the dev credits PHPBB3-15463 --- phpBB/docs/CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index b68281d15c..cb42779641 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -28,6 +28,8 @@ phpBB Developers: bantu (Andreas Fischer) CHItA (Máté Bartus) Derky (Derk Ruitenbeek) Elsensee (Oliver Schramm) + Hanakin (Michael Miday) + MichaelC (Michael Cullum) Nicofuma (Tristan Darricau) For a list of phpBB Team members, please see: -- cgit v1.2.1 From a9ef8212537a64039e1f1ef6b6f05561fa8712ed Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 22 Feb 2018 21:37:49 +0100 Subject: [ticket/15466] Update CREDITS.txt to reflect Nils leaving [ci skip] PHPBB3-15466 --- phpBB/docs/CREDITS.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index cb42779641..4c8974d7c9 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -20,8 +20,6 @@ phpBB Project Manager: Marshalrusty (Yuriy Rusko) -phpBB Product Manager: naderman (Nils Adermann) - phpBB Lead Developer: Marc (Marc Alexander) phpBB Developers: bantu (Andreas Fischer) @@ -43,7 +41,10 @@ https://github.com/phpbb/phpbb/graphs/contributors phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007] SHS` (Jonathan Stanley) -phpBB Lead Developer: Acyd Burn (Meik Sievertsen) [09/2005 - 01/2010] +phpBB Product Manager: naderman (Nils Adermann) [02/2016 - 02/2017] + +phpBB Lead Developer: naderman (Nils Adermann) [01/2010 - 02/2016] + Acyd Burn (Meik Sievertsen) [09/2005 - 01/2010] psoTFX (Paul S. Owen) [2001 - 09/2005] phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] -- cgit v1.2.1 From 09f17a438e7508be4b65f0c490fe8bcbe3628607 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Oct 2018 17:50:29 +0100 Subject: [ticket/15857] Add rubencm to CREDITS.txt [ci skip] PHPBB3-15857 --- phpBB/docs/CREDITS.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 4c8974d7c9..fc089f9e02 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -29,6 +29,7 @@ phpBB Developers: bantu (Andreas Fischer) Hanakin (Michael Miday) MichaelC (Michael Cullum) Nicofuma (Tristan Darricau) + rubencm (Rubén Calvo) For a list of phpBB Team members, please see: http://www.phpbb.com/about/team/ -- cgit v1.2.1 From 4bf485395e2f66bc1aa8bfc9fde458c450238cb9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 26 Dec 2018 23:41:27 +0100 Subject: [ticket/15921] Use twemoji PHPBB3-15921 --- phpBB/docs/CREDITS.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index fc089f9e02..90e9a31127 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -104,3 +104,6 @@ Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff MIT licenced: Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/ Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com + +Emoji by: +Twemoji (c) 2018 Twitter, Inc, https://twemoji.twitter.com/ -- cgit v1.2.1 From 6757450a0ffa5d59632c1294ed2b2cabe3f7a29b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 8 Sep 2019 21:42:02 +0200 Subject: [prep-release-3.2.8] Update CREDITS.txt --- phpBB/docs/CREDITS.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/docs/CREDITS.txt') diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 90e9a31127..596f4545fa 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -1,7 +1,7 @@ /** * -* phpBB © Copyright phpBB Limited 2003-2016 -* http://www.phpbb.com +* phpBB © Copyright phpBB Limited 2003-2019 +* https://www.phpbb.com * * phpBB is free software. You can redistribute it and/or modify it * under the terms of the GNU General Public License, version 2 (GPL-2.0) @@ -27,7 +27,6 @@ phpBB Developers: bantu (Andreas Fischer) Derky (Derk Ruitenbeek) Elsensee (Oliver Schramm) Hanakin (Michael Miday) - MichaelC (Michael Cullum) Nicofuma (Tristan Darricau) rubencm (Rubén Calvo) @@ -63,6 +62,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] igorw (Igor Wiedler) [08/2010 - 02/2013] imkingdavid (David King) [11/2012 - 06/2014] kellanved (Henry Sudhof) [04/2007 - 03/2011] + MichaelC (Michael Cullum) [11/2017 - 09/2019] nickvergessen (Joas Schilling)[04/2010 - 12/2015] Oleg (Oleg Pudeyev) [01/2011 - 05/2013] prototech (Cesar Gallegos) [01/2014 - 12/2016] -- cgit v1.2.1