Skip to content
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.

Sign up for GitHub

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

merge master back to staging #184

Merged
merged 3 commits into from
Nov 1, 2024
Merged

merge master back to staging #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
277b809
Add CS1 book to supplemental reading books list
cashaffer Jul 18, 2024
9e455d7
Add CS1 course to Canvas course list
cashaffer Jul 18, 2024
45aca0b
Remove instructor ability to create terms
awhicks Oct 25, 2024
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 app/models/ability.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def process_instructor(user)
end

can [:create, :read], InstBook
can [:create, :read], Term
can [:read], Term
can [:create, :read], LatePolicy
can [:update, :destroy], InstBook, user_id: user.id
can [:create, :read], Organization
Expand Down
12 changes: 10 additions & 2 deletions app/views/home/books.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
to view):

%ul
%li
%a{ href: 'https://canvas.instructure.com/enroll/AA7HDH', target: "_blank" }
An objects-first CS1 course

%li
%a{ href: 'https://canvas.instructure.com/enroll/TXJGTB', target: "_blank" }
Data Structures topics for a CS2-level course
Expand Down Expand Up @@ -66,6 +70,11 @@
Supplemental reading versions:

%ul
%li
- url = @config_url + '/OpenDSA/Books/IntroToSoftwareDesign/index.html'
%a{ href: url , target: "_blank" }
An objects-first CS1 course

%li
- url = @config_url + '/OpenDSA/Books/CS2/index.html'
%a{ href: url , target: "_blank" }
Expand All @@ -85,8 +94,7 @@
%li
- url = @config_url + '/OpenDSA/Books/CS3notes/index.html'
%a{ href: url, target: "_blank" }
Coursenotes form of presentation slides for "CS3" course on Data
Structures.
Coursenotes form of presentation slides for "CS3" course on Data Structures.

%li
- url = @config_url + '/OpenDSA/Books/CS4104/index.html'
Expand Down
Loading