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

Jump to bottom

CS169 Spring 2024 Final Changes #320

Merged
merged 95 commits into from
May 15, 2024
Merged

CS169 Spring 2024 Final Changes #320

merged 95 commits into from
May 15, 2024

Conversation

cycomachead
Copy link
Member

@cycomachead cycomachead commented May 10, 2024 •
edited
Loading

This is everything through the end of the Spring 2024 semester

  • merging teachers
  • preview merges
  • support for home school
  • support for uploading files
  • minor config/tweak

ArushC and others added 30 commits April 5, 2024 16:59
@ArushC
generated routes and created a basic preview page for merging
d8a0c3d
@ArushC
wrote merge function and updated preview frontend accordingly
00d4f4b
@ArushC
wrote merge function
6c43d8d
@ArushC
added confirm merge button
3a161f4
@ArushC
fixed bug in merge
8b711cc
@ArushC
change route to merge
c47eec2
@ArushC
add frontend for switch merge order button
893688e
@ArushC
add backend for switch merge order button
fc830dc
@ArushC
rubocop fix
83d70d1
@razztech
Changed routing and updated backend logic
741920a
@razztech
Changed routing and updated backend logic
ca51eb5
@razztech
Solved merge conflicts
2d00cfa
@razztech
Merging doesn't destroy both entries anymore
7c3dcdf
@razztech
Fixed rubocop
37f7c33
@ArushC
add teacher ID field that displays on show page to admin only
661556c
@ArushC
Merge branch 'teacher-merge-feature' of github.com:cs169/BJC-Teacher-…
3c8a7cf 
…Tracker-App into teacher-merge-feature
@ArushC
added epic frontend for deletion warning
23587c8
@ArushC
added merge button and created searchable merge table
8f2198c
@ArushC
added modal popup, but no way to exit modal
67adaf7
@ArushC
add css styling for modal
2da31ec
@ArushC
rubocop fix
7128946
@ArushC
update comments
949dc73
@ArushC
added test for switch merge order
402df22
@ArushC
added merge test
457b271
@ArushC
started cucumber test for session count stuff
48d1ed7
@ArushC
finish merge test
6534641
@ArushC
added test for admin being able to access merge page from teacher sho…
332241e 
…w page
@ArushC
add test to make sure nonadmin cannot access teacher show page
1f2b75d
@ArushC
rubocop fix, and last commit message should have said merge page not …
f983447 
…show page
@ArushC
Merge branch 'main' into teacher-merge-feature
6c9ce94
ArushC and others added 26 commits April 22, 2024 10:35
@ArushC
fixed merge conflicts wrt main
46a8388
@ArushC
fixed confirm form resubmission error
15b71fb
@ArushC
made buttons smaller on merge page
749e254
@ArushC
make personal email plural
867b4bd
@ArushC
Merge pull request #51 from cs169/teacher-merge-feature
ca6c172 
Teacher merge feature
@ArushC
Merge branch 'main' into 187375265/add-testing
2b3154b
@JacksonXu33
fix tests after main merge
32d9c0c
@ArushC
fix nil error
9016d22
@ArushC
merged main into homeschool feature
79ac3f3
@ArushC
fix rails version issue
47085fc
@ArushC
Merge branch 'main' of github.com:cs169/BJC-Teacher-Tracker-App into …
f095b1a 
…teacher-homeschool-feature
@ArushC
uncomment the amazon s3 line
9fdec1b
@ArushC
remove dummy home school
d0c8acf
@ArushC
added visibility tests
698c894
@ArushC
added another sad path test
5eb5999
@ArushC
added file attachment test
3af102d
@ArushC
finished homeschool feature
2af33f6
@ArushC
Merge pull request #55 from cs169/187375265/add-testing
2eb837f 
187375265/add testing
@ArushC
Merge pull request #56 from cs169/teacher-homeschool-feature
204bf60 
Teacher homeschool feature
@perryzjc
Update README.md
2da3423
@ArushC
Merge pull request #59 from cs169/doc/update-readme
5103c00 
Update README.md
@ArushC
Merge pull request #58 from cs169/187460464/bugfix/tooltip
19dc0d8 
finish tooltip bug fix
@cycomachead
merge @beautyjoy / main
4272ddc
@cycomachead
merge main / PR fixes
716296c
@cycomachead
Delete app/helpers/merge_helper.rb
06e01b8
@cycomachead
Delete app/views/merge/merge.html.erb
6f06cbb
cycomachead
cycomachead commented May 11, 2024
View reviewed changes
Gemfile Outdated Show resolved Hide resolved
app/controllers/merge_controller.rb Show resolved Hide resolved
config/routes.rb Outdated Show resolved Hide resolved
@cycomachead cycomachead merged commit c2df482 into beautyjoy:main May 15, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cycomachead @ArushC @razztech @JacksonXu33 @perryzjc