From 2af2bfeca1be26a33a67a75205552cb7dc7f6bb0 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 18 Jul 2017 12:18:41 +0200 Subject: [PATCH 1/4] Updated the Core Team information --- contributing/code/core_team.rst | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index b9ce25e1c98..f719f2b0a07 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -49,10 +49,6 @@ Active Core Members * **Mergers** (``@symfony/mergers`` on GitHub): - * **Bernhard Schussek** (`webmozart`_) can merge into the Form_, - Validator_, Icu_, Intl_, Locale_, OptionsResolver_ and PropertyAccess_ - components; - * **Tobias Schultze** (`Tobion`_) can merge into the Routing_, OptionsResolver_ and PropertyAccess_ components; @@ -69,9 +65,6 @@ Active Core Members * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_, Serializer_ component; - * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_ - component; - * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component; * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component; @@ -81,11 +74,28 @@ Active Core Members * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component. + * **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and + the SecurityBundle_ bundle. + + * **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_ + components and the SecurityBundle_ bundle. + + * **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_, + Form_, Serializer_, DependencyInjection_, and HttpKernel_ components. + * **Deciders** (``@symfony/deciders`` on GitHub): * **Jordi Boggiano** (`seldaek`_); * **Lukas Kahwe Smith** (`lsmith77`_); - * **Ryan Weaver** (`weaverryan`_). + +Former Core Members +~~~~~~~~~~~~~~~~~~~ + +They are no longer part of the Core Team, but we are very grateful for all their +Symfony contributions: + + * **Bernhard Schussek** (`webmozart`_). + * **Abdellatif AitBoudad** (`aitboudad`_). Core Membership Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -158,7 +168,6 @@ Symfony Core Rules and Protocol Amendments The rules described in this document may be amended at anytime at the discretion of the **Project Leader**. - .. [1] Minor changes comprise typos, DocBlock fixes, code standards violations, and minor CSS, JavaScript and HTML modifications. @@ -187,6 +196,8 @@ discretion of the **Project Leader**. .. _Routing: https://github.com/symfony/routing .. _Serializer: https://github.com/symfony/serializer .. _Translation: https://github.com/symfony/translation +.. _Security: https://github.com/symfony/security +.. _SecurityBundle: https://github.com/symfony/security-bundle .. _Stopwatch: https://github.com/symfony/stopwatch .. _TwigBridge: https://github.com/symfony/twig-bridge .. _Validator: https://github.com/symfony/validator @@ -209,3 +220,5 @@ discretion of the **Project Leader**. .. _`xabbuh`: https://github.com/xabbuh/ .. _`javiereguiluz`: https://github.com/javiereguiluz/ .. _`lyrixx`: https://github.com/lyrixx/ +.. _`chalasr`: https://github.com/chalasr/ +.. _`ogizanagi`: https://github.com/ogizanagi/ From 3e6c00759970328c32c7b0de58e5f8aa742a0f20 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 18 Jul 2017 12:34:18 +0200 Subject: [PATCH 2/4] Lots of fixes --- contributing/code/core_team.rst | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index f719f2b0a07..8da4a586150 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -65,28 +65,31 @@ Active Core Members * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_, Serializer_ component; - * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component; + * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_ + components; * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component; * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_ - bundle. + bundle; - * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component. + * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component; * **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and - the SecurityBundle_ bundle. + the SecurityBundle_ bundle; * **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_ - components and the SecurityBundle_ bundle. + components and the SecurityBundle_ bundle; * **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_, - Form_, Serializer_, DependencyInjection_, and HttpKernel_ components. + Form_, Serializer_, DependencyInjection_, and HttpKernel_ components; + + * **Charles Sarrazin** (`csarrazi`_) can merge into the LDAP_ component. * **Deciders** (``@symfony/deciders`` on GitHub): * **Jordi Boggiano** (`seldaek`_); - * **Lukas Kahwe Smith** (`lsmith77`_); + * **Lukas Kahwe Smith** (`lsmith77`_). Former Core Members ~~~~~~~~~~~~~~~~~~~ @@ -94,7 +97,7 @@ Former Core Members They are no longer part of the Core Team, but we are very grateful for all their Symfony contributions: - * **Bernhard Schussek** (`webmozart`_). + * **Bernhard Schussek** (`webmozart`_); * **Abdellatif AitBoudad** (`aitboudad`_). Core Membership Application @@ -187,6 +190,7 @@ discretion of the **Project Leader**. .. _HttpKernel: https://github.com/symfony/http-kernel .. _Icu: https://github.com/symfony/icu .. _Intl: https://github.com/symfony/intl +.. _LDAP: https://github.com/symfony/ldap .. _Locale: https://github.com/symfony/locale .. _MonologBridge: https://github.com/symfony/monolog-bridge .. _OptionsResolver: https://github.com/symfony/options-resolver From 95c1e3d5cfce0de20f4663093fa880ab88a032bc Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 18 Jul 2017 12:38:51 +0200 Subject: [PATCH 3/4] Fixed an error --- contributing/code/core_team.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 8da4a586150..ac87caac1c0 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -226,3 +226,4 @@ discretion of the **Project Leader**. .. _`lyrixx`: https://github.com/lyrixx/ .. _`chalasr`: https://github.com/chalasr/ .. _`ogizanagi`: https://github.com/ogizanagi/ +.. _`csarrazi`: https://github.com/csarrazi/ From 5e17270862f5f005b0f7692407cb3b5f0560ca4e Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 18 Jul 2017 15:12:37 +0200 Subject: [PATCH 4/4] Simplified things --- contributing/code/core_team.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index ac87caac1c0..760246bbd93 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -70,16 +70,15 @@ Active Core Members * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component; - * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_ - bundle; + * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_; * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component; * **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and - the SecurityBundle_ bundle; + the SecurityBundle_; * **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_ - components and the SecurityBundle_ bundle; + components and the SecurityBundle_; * **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_, Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;