Merge branch 'master' into slack-channel-table

TimidRobot · web-flow · commit 8dd3783e21c1 · 2020-12-16T14:48:37.000-08:00
diff --git a/content/blog/authors/aldenpage/contents.lr b/content/blog/authors/aldenpage/contents.lr
@@ -5,4 +5,6 @@ name: Alden Page
 md5_hashed_email: 32853a2ab283e0093bf088d8af5d3cdc
 ---
 about:
-[Alden](https://creativecommons.org/author/aldencreativecommons-org/) is Backend Software Engineer at Creative Commons. He is `@aldenpage` on the CC Slack.
+Alden was previously Backend Software Engineer at Creative Commons.
+
+Prior to joining Creative Commons, Alden developed and operated a real-time market risk management system used by equity derivatives traders at Deutsche Bank. He also has experience working in the ad-tech industry and contributing to free software. Alden currently lives in New York City, where he spends much of his time cycling.
diff --git a/content/blog/authors/brenoferreira/contents.lr b/content/blog/authors/brenoferreira/contents.lr
@@ -5,4 +5,8 @@ name: Breno Ferreira
 md5_hashed_email: c23cf5bf54e6df322a3b17d176b76320
 ---
 about:
-[Breno](https://creativecommons.org/author/brenoferreira/) was previously Front End Engineer at Creative Commons.
+Breno was previously Front End Engineer at Creative Commons.
+
+Breno has 10 years of experience in software development working in various industries, from investment banking to oil engineering, to payment systems.
+
+Outside work, Breno spends his time in Rio de Janeiro, Brazil, where he enjoys running, eating açaí, and paying an occasional visit to the beach. Breno can sometimes be spotted in other corners of the globe on his travels.
diff --git a/content/blog/authors/dhruvkb/contents.lr b/content/blog/authors/dhruvkb/contents.lr
@@ -6,4 +6,4 @@ md5_hashed_email: 0eab64adad056cff2492e7c407a9aa21
 ---
 about:
 
-[Dhruv Bhanushali](https://dhruvkb.github.io/) is the Open Source Community Coordinator at Creative Commons. He goes by `@dhruvkb` on the CC Community Slack workspace. Dhruv developed [CC Vocabulary](https://opensource.creativecommons.org/cc-vocabulary/) as part of [Google Summer of Code 2019](/gsoc-2019/) and now is a maintainer for the project.
+[Dhruv Bhanushali](https://dhruvkb.github.io/) was previously Open Source Community Coordinator at Creative Commons. He goes by `@dhruvkb` on the CC Community Slack workspace. Dhruv developed [CC Vocabulary](https://opensource.creativecommons.org/cc-vocabulary/) as part of [Google Summer of Code 2019](/gsoc-2019/) and now is a maintainer for the project.
diff --git a/content/blog/authors/hugosolar/contents.lr b/content/blog/authors/hugosolar/contents.lr
@@ -5,4 +5,6 @@ name: Hugo Solar
 md5_hashed_email: 34ed7629f6d0276faf18f8e9da3613b9
 ---
 about:
-[Hugo](https://creativecommons.org/author/hugocreativecommons-org/) is the Web Developer at Creative Commons. He's `@hugo` on Slack.
+Hugo was previously Web Developer at Creative Commons.
+
+Hugo brings more than 10 years of experience as a web developer. He spent the last four years as a full stack developer and interface designer, working with local NGOs and institutions supporting social movements and labor unions. He lives in a quiet and small town in Chile with his lovely son; cooking, drinking coffee, and taking care of his orchard. In his free time, he likes to achieve a zen-like state by practicing Karate and Kickboxing.
diff --git a/content/blog/authors/kgodey/contents.lr b/content/blog/authors/kgodey/contents.lr
@@ -5,4 +5,8 @@ name: Kriti Godey
 md5_hashed_email: 078347dbae1783ecf5e18c29b958d176
 ---
 about:
-[Kriti](https://creativecommons.org/author/kriticreativecommons-org/) is Director of Engineering at Creative Commons. She's `kgodey` on Freenode (IRC) and `@kriti` on the CC Slack.
+Kriti was Director of Engineering at Creative Commons from Nov 2018 to Dec 2020.
+
+Kriti shipped her first website when she was ten years old and has been coding ever since. Prior to joining CC, she focused on leading happy and productive distributed engineering teams at startups, and has enjoyed architecting and building both consumer-facing and enterprise software.
+
+Kriti grew up in southern India and moved to the U.S. to attend Oberlin College, where she majored in computer science and mathematics. She is now a proud American citizen, and lives in Oberlin with her husband and 13 overflowing bookcases.
diff --git a/content/blog/authors/mathemancer/contents.lr b/content/blog/authors/mathemancer/contents.lr
@@ -5,4 +5,8 @@ name: Brent Moran
 md5_hashed_email: e56fda401562f168817134ee8cccdf97
 ---
 about:
-[Brent](https://creativecommons.org/author/brent-moran/) is the Senior Data Engineer at Creative Commons. He's `mathemancer` on Freenode (IRC) and `@Brent Moran` on the CC Slack.
+Brent was previously the Senior Data Engineer at Creative Commons.
+
+Raised on a Christmas tree farm in central Missouri, Brent's previous experience includes farm work, playing music, writing music, driving a taxi, acting in plays, building sprinkler systems, plowing snow, reading math papers, writing math papers, and algorithmic pricing. He currently lives on the western edge of Germany with his wife, where he enjoys riding his bike in the forest, bouldering, and programming.
+
+Brent's experience in both music and mathematics demonstrates to him that collaboration on creative work and sharing the results with others have compounding rewards over time. He believes that the modern internet is one of the most powerful tools available for collaboration on, and sharing of, creative output. He hopes, therefore, that his work at Creative Commons helps remove barriers to the free flow of content on the internet, thereby enhancing this most useful tool in some small way.
diff --git a/content/internships/history/contents.lr b/content/internships/history/contents.lr
@@ -25,6 +25,10 @@ CC has participated in Google Summer of Code seven times up to 2013, and twice s
 * [Google Summer of Code 2020](https://summerofcode.withgoogle.com/organizations/5742311717208064/)
     * [Open Source Blog posts](/blog/categories/gsoc-2020/)
     * [Welcome Our Interns from Google Summer of Code and Outreachy!](https://creativecommons.org/2020/05/11/welcome-interns-google-summer-of-code-and-outreachy/)
+    * [The Improved CC Search](https://creativecommons.org/2020/12/15/the-improved-cc-search/)
+    * [Important Updates to the Creative Commons Catalog](https://creativecommons.org/2020/11/02/updates-to-the-creative-commons-catalog/)
+    * [New Improvements in the CC Search Browser Extension](https://creativecommons.org/2020/12/07/new-improvements-in-the-cc-search-browser-extension/)
+    * [The Linked Commons 2.0: What’s New?](https://creativecommons.org/2020/11/04/the-linked-commons-2-0-whats-new/)
 * [Google Summer of Code 2019](https://summerofcode.withgoogle.com/archive/2019/organizations/5500455663173632/)
     * [Open Source Blog posts](/blog/categories/gsoc-2019/)
     * [CC + Google Summer of Code 2019](https://creativecommons.org/2019/03/04/cc-google-summer-of-code-2019/)
@@ -53,6 +57,8 @@ CC participated in Outreachy twice since 2019.
 * [Outreachy May 2020 - August 2020](https://www.outreachy.org/outreachy-may-2020-internship-round/)
     * [Open Source Blog posts](/blog/categories/outreachy-2020/)
     * [Welcome Our Interns from Google Summer of Code and Outreachy!](https://creativecommons.org/2020/05/11/welcome-interns-google-summer-of-code-and-outreachy/)
+    * [Say Hello to Our New CC Open Source Website!](https://creativecommons.org/2020/11/02/cc-open-source-website/)
+    * [Explore the New CC Legal Database Site!](https://creativecommons.org/2020/12/03/explore-the-new-cc-legal-database-site/)
 * [Outreachy December 2019 - March 2020](https://www.outreachy.org/december-2019-to-march-2020-internship-round/)
     * [Open Source Blog posts](/blog/categories/outreachy-2019-20/)
     * [Meet Our 2020 Interns From Outreachy](https://creativecommons.org/2019/12/10/2020-outreachy-interns/)
diff --git a/databags/community_team_members.json b/databags/community_team_members.json
@@ -119,6 +119,73 @@
             "name": "CC Catalog API",
             "repos": "cccatalog-api,image-crawler"
         },
+        {
+            "members": [
+                {
+                    "github": "aldenstpage",
+                    "name": "Alden Page",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "github": "kgodey",
+                    "name": "Kriti Godey",
+                    "role": "Project Maintainer"
+                }
+            ],
+            "name": "CC Licenses",
+            "repos": "cc-licenses,cc-licenses-data"
+        },
+        {
+            "members": [
+                {
+                    "github": "aldenstpage",
+                    "name": "Alden Page",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "github": "mathemancer",
+                    "name": "Brent Moran",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "github": "hugosolar",
+                    "name": "Hugo Solar",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "github": "kgodey",
+                    "name": "Kriti Godey",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "github": "akmadian",
+                    "name": "Ari Madian",
+                    "role": "Project Core Committer"
+                },
+                {
+                    "github": "dhruvkb",
+                    "name": "Dhruv Bhanushali",
+                    "role": "Project Core Committer"
+                },
+                {
+                    "github": "Dhruvi16",
+                    "name": "Dhruvi Butti",
+                    "role": "Project Core Committer"
+                },
+                {
+                    "github": "makkoncept",
+                    "name": "Mayank Nader",
+                    "role": "Project Collaborator"
+                },
+                {
+                    "github": "sp35",
+                    "name": "Shubham Pandey",
+                    "role": "Project Contributor"
+                }
+            ],
+            "name": "CC Open Source",
+            "repos": "creativecommons.github.io-source"
+        },
         {
             "members": [
                 {
@@ -198,16 +265,6 @@
         },
         {
             "members": [
-                {
-                    "github": "aldenstpage",
-                    "name": "Alden Page",
-                    "role": "Project Maintainer"
-                },
-                {
-                    "github": "mathemancer",
-                    "name": "Brent Moran",
-                    "role": "Project Maintainer"
-                },
                 {
                     "github": "hugosolar",
                     "name": "Hugo Solar",
@@ -219,54 +276,24 @@
                     "role": "Project Maintainer"
                 },
                 {
-                    "github": "akmadian",
-                    "name": "Ari Madian",
-                    "role": "Project Core Committer"
-                },
-                {
-                    "github": "dhruvkb",
-                    "name": "Dhruv Bhanushali",
-                    "role": "Project Core Committer"
-                },
-                {
-                    "github": "Dhruvi16",
-                    "name": "Dhruvi Butti",
+                    "github": "JackieBinya",
+                    "name": "Jacqueline Binya",
                     "role": "Project Core Committer"
-                },
-                {
-                    "github": "makkoncept",
-                    "name": "Mayank Nader",
-                    "role": "Project Collaborator"
-                },
-                {
-                    "github": "sp35",
-                    "name": "Shubham Pandey",
-                    "role": "Project Contributor"
                 }
             ],
-            "name": "CC Open Source",
-            "repos": "creativecommons.github.io-source"
+            "name": "CC WordPress Themes",
+            "repos": "creativecommons-base,wp-theme-cc-chapter,wp-theme-creativecommons.org,wp-theme-cc-commoners,wp-theme-cc-sotc,wp-theme-openglam,wp-theme-cctoolkit,wp-theme-summit,creativecommons-certificate"
         },
         {
             "members": [
                 {
-                    "github": "hugosolar",
-                    "name": "Hugo Solar",
-                    "role": "Project Maintainer"
-                },
-                {
-                    "github": "kgodey",
-                    "name": "Kriti Godey",
+                    "github": "mathemancer",
+                    "name": "Brent Moran",
                     "role": "Project Maintainer"
-                },
-                {
-                    "github": "JackieBinya",
-                    "name": "Jacqueline Binya",
-                    "role": "Project Core Committer"
                 }
             ],
-            "name": "CC WordPress Themes",
-            "repos": "creativecommons-base,wp-theme-cc-chapter,wp-theme-creativecommons.org,wp-theme-cc-commoners,wp-theme-cc-sotc,wp-theme-openglam,wp-theme-cctoolkit,wp-theme-summit,creativecommons-certificate"
+            "name": "Data Science Playground",
+            "repos": "data-science-playground"
         },
         {
             "members": [
@@ -475,33 +502,6 @@
             ],
             "name": "WordPress Plugin",
             "repos": "wp-plugin-creativecommons"
-        },
-        {
-            "members": [
-                {
-                    "github": "aldenstpage",
-                    "name": "Alden Page",
-                    "role": "Project Maintainer"
-                },
-                {
-                    "github": "kgodey",
-                    "name": "Kriti Godey",
-                    "role": "Project Maintainer"
-                }
-            ],
-            "name": "CC Licenses",
-            "repos": "cc-licenses,cc-licenses-data"
-        },
-        {
-            "members": [
-                {
-                    "github": "mathemancer",
-                    "name": "Brent Moran",
-                    "role": "Project Maintainer"
-                }
-            ],
-            "name": "Data Science Playground",
-            "repos": "data-science-playground"
         }
     ]
 }
diff --git a/databags/repos.json b/databags/repos.json
@@ -1092,7 +1092,7 @@
             "engineering_project": true,
             "featured": false,
             "id": 170156150,
-            "language": "CSS",
+            "language": "PHP",
             "license": {
                 "name": "GNU General Public License v2.0",
                 "url": "https://github.com/creativecommons/wp-theme-cc-chapter/blob/master/LICENSE"
