merge upstream

Author: bnmnetp

docker-compose.yml

@@ -4,12 +4,11 @@
 version: "3"
 
 services:
-  jobe:
-    image: runestone/jobeinabox
-    build: ./jobeinabox/
-    restart: always
-    volumes:
-    - ./jobeinabox/files:/usr/local/lib/java
+  # jobe:
+  #   image: runestone/jobeinabox
+  #   build: ./jobeinabox/
+  #   volumes:
+  #   - ./jobeinabox/files:/usr/local/lib/java
   runestone:
     image: runestone/server
     restart: always
@@ -57,5 +56,5 @@ services:
       GOOGLE_GA: ${GOOGLE_GA}
       ADS_FILE: '${ADS_FILE}'
       QUICK_START: ${QUICK_START}
-    links:
-    - jobe
+    # links:
+    # - jobe

views/peer/peer_question.html

@@ -61,6 +61,7 @@ <h2>Peer Instruction Question</h2>
     var currentQuestion = '{{=XML(current_question.name)}}';
     document.addEventListener("DOMContentLoaded", function (event) {
         setTimeout(connect, 1000);
+        window.mcList[currentQuestion].submitButton.innerHTML = "Submit";
     });
     var studentVoteCount = 1;
 </script>