Merge branch 'main' into main

McPringle · Oct 7, 2024 · 8f6c337 · 8f6c337
2 parents fcd68f5 + 92c663b
commit 8f6c337
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -140,6 +140,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "leem53",
+      "name": "Lennart",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45996424?v=4",
+      "profile": "https://github.com/leem53",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
@@ -4,7 +4,7 @@ on:
   issues:
     types:
       - opened
-  pull_request:
+  pull_request_target:
     types:
       - opened
 

diff --git a/README.md b/README.md
@@ -424,6 +424,15 @@ Special thanks for all these wonderful people who had helped this project so far
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/patlecat"><img src="https://avatars.githubusercontent.com/u/422020?v=4?s=100" width="100px;" alt="patlecat"/><br /><sub><b>patlecat</b></sub></a><br /><a href="https://github.com/McPringle/apus/commits?author=patlecat" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/haladamateusz"><img src="https://avatars.githubusercontent.com/u/26378632?v=4?s=100" width="100px;" alt="Mateusz Halada"/><br /><sub><b>Mateusz Halada</b></sub></a><br /><a href="https://github.com/McPringle/apus/commits?author=haladamateusz" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/leem53"><img src="https://avatars.githubusercontent.com/u/45996424?v=4?s=100" width="100px;" alt="Lennart"/><br /><sub><b>Lennart</b></sub></a><br /><a href="https://github.com/McPringle/apus/commits?author=leem53" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"></td>
+      <td align="center" valign="top" width="14.28%"></td>
+      <td align="center" valign="top" width="14.28%"></td>
+      <td align="center" valign="top" width="14.28%"></td>
+      <td align="center" valign="top" width="14.28%"></td>
+      <td align="center" valign="top" width="14.28%"></td>
+    </tr>
   </tbody>
 </table>
 

diff --git a/frontend/themes/apus/views/room-view.css b/frontend/themes/apus/views/room-view.css
@@ -89,7 +89,7 @@
     width: 40px;
 }
 
-.room-view .avatar vaadin-avatar-group vaadin-avatar {
+.room-view .avatar vaadin-avatar {
     background-color: var(--speaker-avatar-background-color);
     border: var(--speaker-avatar-border);
 }

diff --git a/pom.xml b/pom.xml
@@ -363,7 +363,7 @@
             <plugin>
                 <groupId>com.giovds</groupId>
                 <artifactId>outdated-maven-plugin</artifactId>
-                <version>1.1.0</version>
+                <version>1.2.0</version>
                 <configuration>
                     <!-- The maximum amount of inactive years allowed -->
                     <years>1</years>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       issues:
         types:
           - opened
-      pull_request:
+      pull_request_target:
         types:
           - opened
@@ Expand Down @@