ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2023-12-22 22:01:09 +00:00
commit 34591ec89f
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/AUTHORS.txt
View File

@ -1,4 +1,4 @@
Since the first commit in January 2003 107 people have submitted patches, Since the first commit in January 2003 108 people have submitted patches,
commits, and other useful contributions to InspIRCd. These people, ordered by commits, and other useful contributions to InspIRCd. These people, ordered by
the number of contributions they have made, are: the number of contributions they have made, are:
@ -35,14 +35,15 @@ the number of contributions they have made, are:
* iwalkalone <iwalkalone69@gmail.com> * iwalkalone <iwalkalone69@gmail.com>
* katsklaw * katsklaw
* Dylan Frank <b00mx0r@aureus.pw> * Dylan Frank <b00mx0r@aureus.pw>
* Val Lorentz <progval+git@progval.net>
* Wade Cline <wadecline@hotmail.com> * Wade Cline <wadecline@hotmail.com>
* Steven Van Acker <steven@singularity.be> * Steven Van Acker <steven@singularity.be>
* Val Lorentz <progval+git@progval.net>
* Dan Parsons <dparsons@nyip.net> * Dan Parsons <dparsons@nyip.net>
* Googolplexed <googol@googolplexed.net> * Googolplexed <googol@googolplexed.net>
* Herman <GermanAizek@yandex.ru> * Herman <GermanAizek@yandex.ru>
* Mantas Mikulėnas <grawity@gmail.com> * Mantas Mikulėnas <grawity@gmail.com>
* Renegade334 <contact.caaeed4f@renegade334.me.uk> * Renegade334 <contact.caaeed4f@renegade334.me.uk>
* satmd <satmd@satmd.de>
* Sheogorath <sheogorath@shivering-isles.com> * Sheogorath <sheogorath@shivering-isles.com>
* typobox43 * typobox43
* Anatole Denis <natolumin@rezel.net> * Anatole Denis <natolumin@rezel.net>
@ -62,7 +63,6 @@ the number of contributions they have made, are:
* Michael Hazell <michaelhazell@hotmail.com> * Michael Hazell <michaelhazell@hotmail.com>
* Molly Miller * Molly Miller
* PhilSliderS * PhilSliderS
* satmd <satmd@satmd.de>
* 0x277F <0x277F@gmail.com> * 0x277F <0x277F@gmail.com>
* A_D * A_D
* Adrien Bustany <adrien@bustany.org> * Adrien Bustany <adrien@bustany.org>
@ -85,6 +85,7 @@ the number of contributions they have made, are:
* Filippo Cortigiani <simos@simosnap.org> * Filippo Cortigiani <simos@simosnap.org>
* Florian Praden <florian@praden.eu> * Florian Praden <florian@praden.eu>
* Garrett Holmstrom <gholms@fedoraproject.org> * Garrett Holmstrom <gholms@fedoraproject.org>
* Hendrik Jäger <gitcommit@henk.geekmail.org>
* James Wheare <james@wheare.org> * James Wheare <james@wheare.org>
* Joel Sing <joel@sing.id.au> * Joel Sing <joel@sing.id.au>
* Jordyn/The Linux Geek <onlinecloud1@gmail.com> * Jordyn/The Linux Geek <onlinecloud1@gmail.com>

2
include/clientprotocol.h
View File

@ -1,7 +1,7 @@
/* /*
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2018-2020, 2022 Sadie Powell <sadie@witchery.services> * Copyright (C) 2018-2020, 2022-2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com> * Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com>
* *
* This file is part of InspIRCd. InspIRCd is free software: you can * This file is part of InspIRCd. InspIRCd is free software: you can

2
src/modules/m_alias.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com> * Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2013, 2015-2019, 2021 Sadie Powell <sadie@witchery.services> * Copyright (C) 2013, 2015-2019, 2021, 2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2015, 2018 Attila Molnar <attilamolnar@hush.com> * Copyright (C) 2012-2015, 2018 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be> * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_haproxy.cpp
View File

@ -428,7 +428,7 @@ private:
public: public:
ModuleHAProxy() ModuleHAProxy()
: Module(VF_VENDOR, "Allows IRC connections to be made using reverse proxies that implement the HAProxy PROXY protocol.") : Module(VF_VENDOR, "Allows IRC connections to be made using reverse proxies that implement version 2 of the HAProxy PROXY protocol.")
, hookprov(std::make_shared<HAProxyHookProvider>(this)) , hookprov(std::make_shared<HAProxyHookProvider>(this))
{ {
} }

2
src/modules/m_ircv3.cpp
View File

@ -131,7 +131,7 @@ private:
public: public:
ModuleIRCv3() ModuleIRCv3()
: Module(VF_VENDOR, "Provides the IRCv3 account-notify, away-notify, and extended-join client capabilities.") : Module(VF_VENDOR, "Provides the IRCv3 account-notify, away-notify, extended-join, and standard-replies client capabilities.")
, Account::EventListener(this) , Account::EventListener(this)
, Away::EventListener(this) , Away::EventListener(this)
, cap_accountnotify(this, "account-notify") , cap_accountnotify(this, "account-notify")

2
src/modules/m_spanningtree/fjoin.cpp
View File

@ -1,7 +1,7 @@
/* /*
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2015, 2018-2020 Sadie Powell <sadie@witchery.services> * Copyright (C) 2015, 2018-2020, 2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com> * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be> * Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_watch.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2019 Robby <robby@chatbelgie.be> * Copyright (C) 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services> * Copyright (C) 2017-2018, 2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com> * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
* *
* This file is part of InspIRCd. InspIRCd is free software: you can * This file is part of InspIRCd. InspIRCd is free software: you can

2
src/users.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com> * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2018 systocrat <systocrat@outlook.com> * Copyright (C) 2018 systocrat <systocrat@outlook.com>
* Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw> * Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
* Copyright (C) 2013, 2016-2022 Sadie Powell <sadie@witchery.services> * Copyright (C) 2013, 2016-2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org> * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2013 ChrisTX <xpipe@hotmail.de> * Copyright (C) 2013 ChrisTX <xpipe@hotmail.de>
* Copyright (C) 2013 Adam <Adam@anope.org> * Copyright (C) 2013 Adam <Adam@anope.org>