Skip to content

Fix typos #1526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Rails/Blank:
Layout/LineLength:
Max: 100
# To make it possible to copy or click on URIs in the code, we allow lines
# contaning a URI to be longer than Max.
# containing a URI to be longer than Max.
AllowURI: true
URISchemes:
- http
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Since 2010, Autolab has had a transformative impact on education at CMU. Each se
[![Build Status](https://travis-ci.org/autolab/Autolab.svg)](https://travis-ci.org/autolab/Autolab)
![GitHub last commit](https://img.shields.io/github/last-commit/autolab/Autolab)

Subscribe to our [mailing list](https://groups.google.com/g/autolabproject) to recieve announcements about major releases and updates to the Autolab Project.
Subscribe to our [mailing list](https://groups.google.com/g/autolabproject) to receive announcements about major releases and updates to the Autolab Project.

## Try It Out
We have a demo site running at https://nightly.autolabproject.com/. See the [docs](https://docs.autolabproject.com/#demonstration-site) for more information on how to login and suggestions on things to try.
Expand Down
10 changes: 5 additions & 5 deletions app/assets/javascripts/annotations.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(document).ready(function () {
resizeCodeTable();
});

/* On Window Reisze */
/* On Window Resize */
$(window).on('resize', function () {
resizeCodeTable();
});
Expand All @@ -33,9 +33,9 @@ function retrieveSharedComments() {

function resizeCodeTable() {
// Resize code table if announcements are shown
if ($(".annoucement.gray-box")) {
$('.code-table').css("max-height", $(window).height() - $(".annoucement.gray-box").height() - 250);
$('#annotationPane').css("max-height", $(window).height() - $(".annoucement.gray-box").height() - 200);
if ($(".announcement.gray-box")) {
$('.code-table').css("max-height", $(window).height() - $(".announcement.gray-box").height() - 250);
$('#annotationPane').css("max-height", $(window).height() - $(".announcement.gray-box").height() - 200);
}
}

Expand Down Expand Up @@ -774,7 +774,7 @@ function newAnnotationBoxForPDF(annObj) {

$(edit).on("mousedown", function (e) {
return false;
}); // Prevents dragging and edting
}); // Prevents dragging and editing

// Maximize On Click
// Shows everything and returns everything to size
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/animate.css
Original file line number Diff line number Diff line change
Expand Up @@ -2410,8 +2410,8 @@ Copyright (c) 2014 Daniel Eden
100% {
-webkit-transform-origin: left bottom;
transform-origin: left bottom;
-webkit-transform: rotate(0, 0, 1, 45deg);
transform: rotate(0, 0, 1, 45deg);
-webkit-transform: rotate3d(0, 0, 1, 45deg);
transform: rotate3d(0, 0, 1, 45deg);
opacity: 0;
}
}
Expand All @@ -2428,9 +2428,9 @@ Copyright (c) 2014 Daniel Eden
-webkit-transform-origin: left bottom;
-ms-transform-origin: left bottom;
transform-origin: left bottom;
-webkit-transform: rotate(0, 0, 1, 45deg);
-ms-transform: rotate(0, 0, 1, 45deg);
transform: rotate(0, 0, 1, 45deg);
-webkit-transform: rotate3d(0, 0, 1, 45deg);
-ms-transform: rotate3d(0, 0, 1, 45deg);
transform: rotate3d(0, 0, 1, 45deg);
opacity: 0;
}
}
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/annotations.css
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@

#pdf-doc .ann-box .score-box {
float: none;
background-color: transparent;
color: black;
border-radius: 2px;
font-size: 12px;
Expand Down
11 changes: 1 addition & 10 deletions app/assets/stylesheets/beta.css
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ table.prettyBorder tr:hover,
}

ul.panel {
list-style-image: none;
list-style: none;
margin: 0px;
padding: 0px;
Expand Down Expand Up @@ -469,7 +468,6 @@ table.announcements a {
input[type="button"] {
display: inline-block;
margin: 2px;
color: #fff;
cursor: pointer;
text-decoration: none;
padding: 5px;
Expand Down Expand Up @@ -526,8 +524,6 @@ div.navLinks .navbutton,
cursor: pointer;
color: #eee;
position: relative;
margin: 0px;
padding: 2px;
list-style: none;
display: block;
padding: 10px 15px;
Expand Down Expand Up @@ -641,7 +637,6 @@ li:hover .half {
font-size: 12px;
color: #888;
padding: 15px;
background-color: #eaebed;
background-color: #e5e5e5;
background: -webkit-gradient(
linear,
Expand Down Expand Up @@ -752,7 +747,6 @@ input.button {
padding: 8px;
margin: 2px;
margin-bottom: 10px;
border: none;
outline: none;
color: #888;
background-color: #f5f5f5;
Expand All @@ -767,7 +761,6 @@ input[type="submit"] {
min-width: 70px;
font-size: 12px;
margin: 2px;
color: #fff;
cursor: pointer;
text-decoration: none;
padding: 5px;
Expand Down Expand Up @@ -813,7 +806,6 @@ textarea {
padding: 8px;
margin: 2px;
margin-bottom: 10px;
border: none;
outline: none;
color: #000;
-webkit-border-radius: 5px;
Expand Down Expand Up @@ -992,7 +984,7 @@ th:hover a.graphme:hover {
position: absolute;
top: 0px;
left: 0px;
z-axis: 100000;
z-index: 100000;
}

.blackbox {
Expand Down Expand Up @@ -1064,7 +1056,6 @@ table.prettyBorder th {
font-size: 12px;
color: #888;
padding: 5px;
background-color: #eaebed;
background-color: #e5e5e5;
background: -webkit-gradient(
linear,
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/gradesheet.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ td.id {

#grades .popover {
cursor: auto;
display: none;
color: #666;
position: absolute;
top: 0;
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/mobile.css
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ img.select{
display:block;
margin:10px 15px;
text-align:center;
color:#FFF;
cursor:pointer;
text-decoration:none;
padding:15px;
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/annotations_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# All modifications to the annotations are meant to be asynchronous and
# thus this contorller only exposes javascript interfaces.
# thus this controller only exposes javascript interfaces.
#
# Only people acting as instructors or CA's should be able to do anything
# but view the annotations and since all of these mutate them, they are
Expand Down
8 changes: 4 additions & 4 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class ApplicationController < ActionController::Base
helper :all # include all helpers, all the time

before_action :configure_permitted_paramters, if: :devise_controller?
before_action :configure_permitted_parameters, if: :devise_controller?
before_action :maintenance_mode?
before_action :run_scheduler

Expand Down Expand Up @@ -77,7 +77,7 @@ def self.action_auth_level(action, level)
def self.action_no_auth(action)
skip_before_action :verify_authenticity_token, only: [action], raise: false
skip_before_action :authenticate_user!, only: [action], raise: false
skip_before_action :configure_permitted_paramters, only: [action], raise: false
skip_before_action :configure_permitted_parameters, only: [action], raise: false
skip_before_action :maintenance_mode?, only: [action], raise: false
skip_before_action :run_scheduler, only: [action], raise: false

Expand All @@ -89,7 +89,7 @@ def self.action_no_auth(action)

protected

def configure_permitted_paramters
def configure_permitted_parameters
devise_parameter_sanitizer.permit(:sign_in) { |u| u.permit(:email) }
devise_parameter_sanitizer.permit(:sign_up) do |u|
u.permit(:email, :first_name, :last_name, :password, :password_confirmation)
Expand Down Expand Up @@ -352,7 +352,7 @@ def render_error(exception)
if !current_user.nil? && (current_user.instructor? || current_user.administrator?)
@error = exception

# Generate course id and assesssment id objects
# Generate course id and assessment id objects
@course_name = params[:course_name] ||
(params[:controller] == "courses" ? params[:name] : nil)
if @course_name
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/assessment/handin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module AssessmentHandin
#
# validateHandin_forHTML() cannot modify the state of the world in any way. And it should
# call super() to enable any other functionality. The only reason to not call super()
# is if you want to prevent other functionlity. You should be very careful about this.
# is if you want to prevent other functionality. You should be very careful about this.
#
# Any errors should be added to flash[:error] and return false or nil.
def handin
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/github_integrations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class GithubIntegrationsController < ApplicationController
skip_before_action :update_persistent_announcements
before_action :set_github_integration

# This API endpoint retrives the 30 most recently pushed repositories of the user
# This API endpoint retrieves the 30 most recently pushed repositories of the user
# if the user has connected their account to Github
action_auth_level :get_repositories, :student
def get_repositories
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/home_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def publicSignUp
redirect_to(controller: "course", course: @course.name,
action: "index") && return
else
flash[:error] = "An internal error occured. Please contact the " \
flash[:error] = "An internal error occurred. Please contact the " \
"Autolab Development team at the " \
"contact link below"
redirect_to(controller: "home", action: "index") && return
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/metrics_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def get_watchlist_instances
# (a json containing more info pertaining to violation)
#
# risk_conditions: dictionary of risk conditions found in watchlist instances,
# key being the risk_conditon_id each entry contains the condition_type
# key being the risk_condition_id each entry contains the condition_type
#
# users: dicitonary of users found in watchlist instances, key being the course_user_datum_id
# users: dictionary of users found in watchlist instances, key being the course_user_datum_id
# each entry contains the first name, last name and email
#
# params required would be the course name
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/oauth/device_flow_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def set_app

@app = Doorkeeper::Application.find_by(uid: params[:client_id])
if @app.nil?
raise DeviceFlowError.new("Unrecongized client_id", :bad_request)
raise DeviceFlowError.new("Unrecognized client_id", :bad_request)
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/schedulers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def create
flash[:success] = "Scheduler created!"
redirect_to(course_schedulers_path(@course)) and return
else
flash[:error] = "Create failed. Pleaes check all fields."
flash[:error] = "Create failed. Please check all fields."
redirect_to(action: "new") and return
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/scoreboards_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def createScoreboardEntry(scores, autoresult)
rescue StandardError
# If there is no autoresult for this student (typically
# because their code did not compile or it segfaulted and
# the intructor's autograder did not catch it) then
# the instructor's autograder did not catch it) then
# return a nicely formatted nil result.
begin
parsed = ActiveSupport::JSON.decode(@scoreboard.colspec)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/submissions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def get_submission_file
end

# Extract the andrewID from a filename.
# Filename format is andrewID_version_asessment.ext
# Filename format is andrewID_version_assessment.ext
def extractAndrewID(filename)
underscoreInd = filename.index("_")
return filename[0...underscoreInd] unless underscoreInd.nil?
Expand All @@ -542,7 +542,7 @@ def extractAndrewID(filename)
end

# Extract the version from a filename
# Filename format is andrewID_version_asessment.ext
# Filename format is andrewID_version_assessment.ext
def extractVersion(filename)
firstUnderscoreInd = filename.index("_")
return nil if firstUnderscoreInd.nil?
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def show
end

# GET users/new
# only adminstrator and instructors are allowed
# only administrator and instructors are allowed
action_auth_level :new, :instructor
def new
if current_user.administrator? || current_user.instructor?
Expand Down
2 changes: 1 addition & 1 deletion app/models/assessment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ def active?
end

##
# This function attempts to preserve Backwords Compatibility for when assessments are
# This function attempts to preserve Backwards Compatibility for when assessments are
# imported from a YAML file
#
GENERAL_BC = { "category" => "category_name",
Expand Down
2 changes: 1 addition & 1 deletion app/models/risk_condition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def self.update_current_for_course(course_name, params)
max_version = RiskCondition.get_max_version(course_id)
# Is params empty?
if params.empty? && (max_version == 0)
# puts "case 1: max_version = 0 (no previous conditons have been set)
# puts "case 1: max_version = 0 (no previous conditions have been set)
# and instructor doesn't want any at this point"
WatchlistInstance.refresh_instances_for_course(course_name, true)
return []
Expand Down
4 changes: 2 additions & 2 deletions app/models/submission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def archive_handin
archive = File.join(assessment.handin_directory_path, "archive")
Dir.mkdir(archive) unless FileTest.directory?(archive)

# Using the id instead of the version guarentees a unique filename
# Using the id instead of the version guarantees a unique filename
submission_backup = File.join(archive, "deleted_#{filename}")
FileUtils.mv(handin_file_path, submission_backup)

Expand Down Expand Up @@ -350,7 +350,7 @@ def latest?
(aud.latest_submission_id == id)
end

# override as_json to include the total with a paramter
# override as_json to include the total with a parameter
def as_json(options = {})
json = super(options)
json["total"] = final_score options[:seen_by]
Expand Down
2 changes: 1 addition & 1 deletion app/views/announcements/_announcements_list.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if local_assigns[:announcements] && params[:controller] != 'announcements' then %>
<ul class="annoucement gray-box">
<ul class="announcement gray-box">
<%= render local_assigns[:announcements] %>
</ul>
<% end %>
2 changes: 1 addition & 1 deletion app/views/assessments/_bulkGrade_initial.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Choose a file that contain rows of problem scores or feedback in the following c
<div class="radio">
<%= f.label(:data_type_feedback) do %>
<%= f.radio_button :data_type, "feedback" %>
<span>Feedback</span></br>
<span>Feedback</span><br>
<span class="info">use escape characters in place of newlines (\n) and tabs (\t)</span>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/assessments/_edit_advanced.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<% if @assessment.embedded_quiz_form_data.nil? %>
Upload Embedded Form
<% else %>
Replace Exisiting Embedded Form
Replace Existing Embedded Form
<% end %>
<%= f.file_field_nowrap :embedded_quiz_form, class: "upload_embedded" %>
</span>
Expand Down
6 changes: 3 additions & 3 deletions app/views/assessments/_popover.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<% if s.filename %>
<tr><th>Type</th><td><%= s.mime_type %></td></tr>
<% end %>
<tr><th>Version</td><td class="version">
<tr><th>Version</th><td class="version">
<% version = s.version == 0 ? "Unofficial" : s.version %>
<%= version %>
<% if @cud.instructor? %>
Expand All @@ -22,12 +22,12 @@
<% if @cud.instructor? && @assessment.version_penalty? %>
<tr><th>Version Over Threshold By</th><td><%= s.version_over_threshold_by %></tr>
<% end %>
<tr><th>Submitted on</td><td><%= s.created_at %></td></tr>
<tr><th>Submitted on</th><td><%= s.created_at %></td></tr>
<% if @cud.instructor? %>
<tr><th>Used grace days</th><td><%= s.grace_days_used %></tr>
<tr><th>+ Penalty late days</th><td><%= s.penalty_late_days %></td></tr>
<tr><th>= Days late</th><td><%= s.days_late %></td></tr>
<tr><th>Grade Type</td><td>
<tr><th>Grade Type</th><td>
<%= link_to grade_type_to_s(s.aud.grade_type),
edit_course_assessment_assessment_user_datum_path(@course, @assessment, s.aud) %>
</td></tr>
Expand Down
Loading