workgroups: remove #monero-dev from Core Team

* update twitter.com to x.com * move github and gitlab to workgroup from hangouts page * remove duplicate channels (that exist in both workgroup and hangouts) * mention matrix+IRC (instead just IRC) * Rename development workgroup to monero core workgroup Co-authored-by: nahuhh <[email protected]> Co-authored-by: nahuhh <[email protected]>
monero-project · Oct 6, 2024 · aa9ddf2 · aa9ddf2
1 parent ba940d4
commit aa9ddf2
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 31 deletions.
diff --git a/_data/chats.yml b/_data/chats.yml
@@ -5,9 +5,6 @@ chats:
 - monero-community:
   matrix: https://matrix.to/#/%23monero-community:monero.social
 
-- monero-dev: 
-  matrix: https://matrix.to/#/%23monero-dev:monero.social
-
 - monero-markets:
   matrix: https://matrix.to/#/%23monero-markets:monero.social
 
@@ -17,14 +14,5 @@ chats:
 - monero-pools:
   matrix: https://matrix.to/#/%23monero-pools:monero.social
 
-- monero-research-lab:
-  matrix: https://matrix.to/#/%23monero-research-lab:monero.social
-
-- monero-translations:
-  matrix: https://matrix.to/#/%23monero-translations:monero.social
-
 - monero-hardware:
   matrix: https://matrix.to/#/%23monero-hardware:matrix.org
-
-- monero-site:
-  matrix: https://matrix.to/#/%23monero-site:monero.social
diff --git a/_i18n/en.yml b/_i18n/en.yml
@@ -123,23 +123,19 @@ hangouts:
   resources: Workgroup Resources
   resources_para: In an effort to support organic workgroups, Monero has several resources that the community can use to meet and plan projects,
   resources_para1: like a Matrix server, a Taiga board and the translation platform Weblate.
-  irc: IRC Channels
-  irc_para: The Monero community utilizes a lot of IRC channels that each serve different purposes. Some to work, and some just to hang out. You'll find the more popular ones below.
+  irc-matrix: IRC/Matrix Channels
+  irc_para: The Monero community utilizes a lot of IRC and Matrix channels that each serve different purposes. Some to work, and some just to hang out. You'll find the more popular ones below.
   bridges: These channels are bridged to a number of other platforms, allowing the community to communicate using their favourite chat service/protocol.
   mailing_list: Mailing List
   mailing_list1: Do you want to receive important announcements directly on your email address? join our mailing lists!
   subscribe: Subscribe
   irc_channels:
     monero: This channel is used to discuss all things Monero related.
     monero-community: This channel is for the Monero community to congregate and discuss ideas.
-    monero-dev: The many contributors and developers come here to discuss dev-y things.
     monero-markets: We use this channel to talk about the price of Monero and other coins.
     monero-offtopic: Chatting with other Monero users about things not related to Monero.
     monero-pools: This is the place for mining questions and discussion.
-    monero-research-lab: Research into financial privacy with cryptocurrency.
-    monero-translations: Localizing Monero into other languages.
     monero-hardware: Building hardware wallets to keep your Monero safe.
-    monero-site: Where the development of this website is coordinated.
 
 merchants:
   descr: On this page you will find stores and merchants that accept Monero as payment, as well as exchanges that trade Monero for other currencies.
@@ -196,8 +192,8 @@ team:
   core_start: The Core Team is a closed workgroup; it's not possible to join unless invited.
   community_descr: This workgroup is used by the community to organize and coordinate. Start here if you are a non-coder who wants to contribute to Monero.
   community_start: The best way to start contributing to this workgroup is to join the chatrooms and introduce yourself, stating your interests and the skills you would like to offer to the community.
-  devworkgroup: Development Workgroup
-  devworkgroup_descr: "This workgroup unites Monero developers working on the wallets and daemon maintained by the Core Team. It consists of two main parts: the CLI team and the GUI team. These teams coordinate using two different chatrooms."
+  devworkgroup: Development Workgroups
+  devworkgroup_descr: "This workgroup unites developers working on The Monero Project wallets and daemon. It consists of two main parts: the CLI team and the GUI team. These teams coordinate using two different chatrooms."
   devworkgroup_start: It's a good idea to take a look at open issues on both repositories to have an idea of what could be fixed or improved. Both codebases, but especially the core repository, can be quite challenging, so it's suggested to first write in the chatroom introducing yourself, your skills, and to what you wish to contribute.
   chatgeneral: "Chat (general):"
   chatgui: "Chat (GUI):"
@@ -222,6 +218,9 @@ team:
   mpwg_start: If you would like to take part or follow policy discussions, join Matrix/Libera chatroom.
   nwlb_descr: The Seraphis wallet workgroup is a group of developers working on implementing Seraphis and Jamtis in Monero, through developing a completely new type of wallet that will improve drastically Monero's privacy capabilities and usability.
   nwlb_start: The workgroup meets frequently and coordinates in the Matrix room (relayed to IRC). They are always looking for contributors willing to help.
+  docs: Monero Documentation Workgroup
+  docs_descr: This workgroup works on documentation of Monero and its tools.
+  docs_start: You can join the IRC or Matrix room.
 
 downloads:
   intro: On this page you can find and download the latest version available of the Monero software, as well as hardware, light and mobile wallets.
@@ -547,7 +546,7 @@ faq:
   alongtimemove: Don't worry, your coins are safe. To be able to spend them you only have to download and run the latest Monero software. You can use the @mnemonic-seed you previously saved to restore your wallet at any time. Note that hard forks in Monero are scheduled and non-contentious. Which means no new coin is created.
   qvuln: Are there known vulnerabilities in Monero?
   avuln: >
-    The Monero community has created a series of videos called "Breaking Monero", where potential Monero vulnerabilities are explored and discussed. There are 14 videos, with each exploring a different subject. Check out <a href="https://www.youtube.com/playlist?list=PLsSYUeVwrHBnAUre2G_LYDsdo-tD0ov-y">the playlist on YouTube</a>.
+    The Monero community has created a series of videos called "Breaking Monero", where potential Monero vulnerabilities are explored and discussed. There are 14 videos, with each exploring a different subject. Check out 
   vulnspotify: Available on Spotify as podcast
   qasicresistance: "What is ASIC resistance? Why is it important?"
   aasicresistance: ASICs are basically special computers created to do only one job, contrary to normal computers, which are made for general purpose. This characteristic makes ASICs very efficient for @mining.

diff --git a/community/hangouts/index.md b/community/hangouts/index.md
@@ -11,20 +11,14 @@ meta_descr: hangouts.intro
     <section class="hangouts-social container">   
         <ul class="row center-xs">
             <li>
-                <a class="ext-noicon" href="https://twitter.com/monero" target="_blank" rel="noreferrer noopener" aria-label="Twitter logo"><div class="social-icon twitter"></div></a>
+                <a class="ext-noicon" href="https://x.com/monero" target="_blank" rel="noreferrer noopener" aria-label="Twitter logo"><div class="social-icon twitter"></div></a>
             </li>
             <li>
                 <a class="ext-noicon" href="https://reddit.com/r/Monero" target="_blank" rel="noreferrer noopener" aria-label="Reddit logo"><div class="social-icon reddit"></div></a>
             </li>
             <li>
                 <a class="ext-noicon" href="https://www.facebook.com/monerocurrency/" target="_blank" rel="noreferrer noopener" aria-label="Facebook logo"><div class="social-icon facebook"></div></a>
             </li>
-            <li>
-                <a class="ext-noicon" href="https://github.com/monero-project" target="_blank" rel="noreferrer noopener" aria-label="GitHub logo"><div class="social-icon github"></div></a>
-            </li>
-            <li>
-                <a class="ext-noicon" href="https://repo.getmonero.org/users/monero-project/projects" target="_blank" rel="noreferrer noopener" aria-label="Gitlab logo"><div class="social-icon gitlab"></div></a>
-            </li>
             <li>
                 <a class="ext-noicon" href="https://telegram.me/monero" target="_blank" rel="noreferrer noopener" aria-label="Telegram logo"><div class="social-icon telegram"></div></a>
             </li>
@@ -81,7 +75,7 @@ meta_descr: hangouts.intro
                  <h2>{% t hangouts.irc %}</h2>
               </div>
               <div class="row start-xs">
-                <p>{% t hangouts.irc_para %} {% t hangouts.bridges %}</p>
+                <p>{% t hangouts.irc-matrix %} {% t hangouts.bridges %}</p>
              </div>
              <div class="row irc">
              {% for channel in site.translations[site.lang].hangouts.irc_channels %}

diff --git a/community/workgroups/index.md b/community/workgroups/index.md
@@ -9,6 +9,16 @@ meta_descr: meta_descr.workgroups
 <div class="team">
   <div class="container description">
     <p>{% t team.introduction %}</p>
+    <section class="workgroups container">   
+        <ul class="row center-xs">
+            <li>
+                <a class="ext-noicon" href="https://github.com/monero-project" target="_blank" rel="noreferrer noopener" aria-label="GitHub logo"><div class="social-icon github"></div></a>
+            </li>
+            <li>
+                <a class="ext-noicon" href="https://repo.getmonero.org/users/monero-project/projects" target="_blank" rel="noreferrer noopener" aria-label="Gitlab logo"><div class="social-icon gitlab"></div></a>
+            </li>
+        </ul>
+    </section>
   </div>
   <section class="container">
     <div class="row">
@@ -23,7 +33,6 @@ meta_descr: meta_descr.workgroups
           <p>{% t team.core_start %}</p>
           <h4>{% t team.contacts %}</h4>
           <ul class="logo">
-            <li>{% t team.chat %} <code>#monero-dev</code> <a class="chats-img" href="irc://irc.libera.chat/#monero-dev"><img class="libera" src="/img/libera.svg" title="libera" alt="libera logo"></a> <a class="chats-img" href="https://matrix.to/#/%23monero-dev:monero.social?via=matrix.org&via=monero.social"><img class="matrix" src="/img/matrix-logo.svg" title="Matrix" alt="Matrix logo"></a></li>
             <li>Email: <code>dev[at]getmonero[dot]org</code></li>
           </ul>
           <div class="row center-xs icons">
@@ -196,6 +205,23 @@ meta_descr: meta_descr.workgroups
           </ul>
         </div>
       </div>
+      <div class="right half col-lg-6 col-md-6 col-sm-12 col-xs-12">
+        <div class="info-block">
+          <div class="row center-xs">
+            <h2>{% t team.docs %}</h2>
+          </div>
+          <h4>{% t team.descr %}</h4>
+          <p>{% t team.docs_descr %}</p>
+          <h4>{% t team.start %}</h4>
+          <p>{% t team.docs_start %}</p>
+          <h4>{% t team.contacts %}</h4>
+          <ul class="logo">
+            <li>{% t team.chat %} <code>#monero-docs</code> <a class="chats-img" href="irc://irc.libera.chat/#monero-docs"><img class="libera" src="/img/libera.svg" title="libera" alt="libera logo"></a><a class="chats-img" href="https://matrix.to/#/%23monero-docs:monero.social?via=matrix.org"><img class="matrix" src="/img/matrix-logo.svg" title="Matrix" alt="Matrix logo"></a></li>
+            <li>{% t team.website %} <a href="https://docs.getmonero.org">mrw.getmonero.org</a></li>
+          </ul>
+        </div>
+      </div>
+
     </div>
   </section>
 </div>
diff --git a/css/custom.css b/css/custom.css
@@ -4096,7 +4096,7 @@ p.hangouts-social {
     margin-bottom: 1rem!important;
 }
 
-.hangouts-social ul {
+.hangouts-social ul, .workgroups ul {
     list-style: none;
     padding: 0;
     margin-bottom: 2.5rem;