Merging in upstream changes

composer.json

@@ -51,7 +51,7 @@
         "eher/oauth": "1.0.7",
         "aws/aws-sdk-php": "3.67.17",
         "symfony/dotenv": "^5.1",
-        "ucfopen/materia-theme-ucf": "2.0.1"
+        "ucfopen/materia-theme-ucf": "2.0.2"
     },
     "suggest": {
         "ext-memcached": "*"
@@ -97,9 +97,9 @@
             "package": {
                 "name": "ucfopen/materia-theme-ucf",
                 "type": "fuel-package",
-                "version": "2.0.1",
+                "version": "2.0.2",
                 "dist": {
-                    "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.1.zip",
+                    "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.2.zip",
                     "type": "zip"
                 },
                 "source": {

materia-fake-s3.Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5-alpine
+FROM ruby:2.6-alpine
 
 RUN gem install fakes3 -v 2.0.0 --no-document
 

src/components/my-widgets-score-semester-individual.jsx

@@ -41,7 +41,7 @@ const MyWidgetScoreSemesterIndividual = ({ semester, instId }) => {
 					let newLogs = state.logs
 
 					result.pagination.forEach((record) => {
-						if (newLogs[record.userId]) newLogs[record.userId].scores.push({...record.scores})
+						if (newLogs[record.userId]) newLogs[record.userId].scores.push(...record.scores)
 						else newLogs[record.userId] = { userId: record.userId, name: record.name, searchableName: record.searchableName, scores: record.scores }
 						newLogs[record.userId].scores.sort(_compareScores)
 					})

src/components/user-admin-page.scss

@@ -87,6 +87,18 @@
 
 			> div {
 				display: inline-block;
+
+				&.img-holder {
+					display: inline-block;
+
+					img {
+						width: 50px;
+						height: 50px;
+						border-radius: 3px;
+						display: inline-block;
+						margin-right: 10px;
+					}
+				}
 			}
 		}