Merge branch 'main' into bad-status-hover-text

Submitty · Jul 16, 2024 · 06ba5a8 · 06ba5a8
2 parents 77f1112 + 35e52ac
commit 06ba5a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     name: Dispatch Update
     runs-on: ubuntu-latest
     steps:
-      - uses: Submitty/peter-evans-repository-dispatch@v23.07.00
+      - uses: Submitty/peter-evans-repository-dispatch@v24.07.00
         if: ${{ github.repository_owner == 'Submitty' }}
         with:
           event-type: repo-release

diff --git a/main.cpp b/main.cpp
@@ -778,8 +778,6 @@ void preprocesscustomizationfile(const std::string &now_string,
       DISPLAY_RANK_TO_INDIVIDUAL = true;
     } else if (token == "display_benchmark") {
       continue;
-    } else if (token == "benchmark_percent") {
-      continue;
     } else if (token == "section") {
       continue;
     } else if (token == "messages") {

diff --git a/output.cpp b/output.cpp
@@ -577,12 +577,12 @@ void start_table_output( bool /*for_instructor*/,
   student_data.push_back(counter); table.set(0,counter++,TableCell("ffffff","USERNAME"));
   student_data.push_back(counter); table.set(0,counter++,TableCell("ffffff","NUMERIC ID"));
   if (DISPLAY_INSTRUCTOR_NOTES || DISPLAY_FINAL_GRADE) {
-    table.set(0,counter++,TableCell("ffffff","LAST (LEGAL)"));
-    table.set(0,counter++,TableCell("ffffff","FIRST (LEGAL)"));
+    table.set(0,counter++,TableCell("ffffff","FAMILY (LEGAL)"));
+    table.set(0,counter++,TableCell("ffffff","GIVEN (LEGAL)"));
   }
   int last_name_counter=counter;
-  table.set(0,counter++,TableCell("ffffff","LAST"));
-  student_data.push_back(counter);  table.set(0,counter++,TableCell("ffffff","FIRST"));
+  table.set(0,counter++,TableCell("ffffff","FAMILY"));
+  student_data.push_back(counter);  table.set(0,counter++,TableCell("ffffff","GIVEN"));
   student_data.push_back(last_name_counter);
   student_data.push_back(counter);  table.set(0,counter++,TableCell(grey_divider));