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

Redesigned courses modal to include ability to filter courses by difficulty and category. #355

Closed
wants to merge 265 commits into from
Closed

Redesigned courses modal to include ability to filter courses by difficulty and category. #355

wants to merge 265 commits into from

Conversation

samuel-zuk
Copy link
Contributor

References #226. Would require updates to the backend and admin page as well.

samuel-zuk and others added 30 commits June 7, 2019 14:15
@samuel-zuk
updated subtractive geometry to work with groups
c642480
@samuel-zuk
disabled save, play, stop, and recover when reference is open in new tab
e532437
@samuel-zuk
disabled buttons in sidebar via button styles rather than hiding them…
c4cdcd5 
… altogether
@samuel-zuk
added tests for subtractive functions
6fc4cbf
@samuel-zuk
Merge branch 'dev' of https://github.com/engaging-computing/MYR into dev
7dd0f1f
@jSwanson99
Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render,…
d48ea79 
… and added a loading screen/overlay while waiting for view to mount
@samuel-zuk
Merge branch 'dev' of https://github.com/engaging-computing/MYR into dev
1ac632d
@samuel-zuk
Merge branch 'dev' of github.com:samuel-zuk/MYR
feade46
@samuel-zuk
re-removed makeUnDroppable/makeUnPushable from the autocomplete
1e564c2
@jSwanson99
Fixed formatting, moved render bug fix to state, removed loading scre…
be6cd4f 
…en changes
@jSwanson99
Render changes reversed
e61bdd5
@jSwanson99
Resolved merge conflicts
7e71e98
@jSwanson99
Should have resolved merge conflicts
99247d0
@jasondkiesling
Merge branch 'dev' into master
ef4a452
@samuel-zuk
Revert "re-removed makeUnDroppable/makeUnPushable from the autocomplete"
032dc4c 
This reverts commit 1e564c2.
@samuel-zuk
Revert "Merge branch 'dev' of github.com:samuel-zuk/MYR"
078b90b 
This reverts commit feade46, reversing
changes made to c4cdcd5.
create new commit in different branch to hope that it didn't highligh…
0cd4b34 
…t unnecessary code
@samuel-zuk
Revert "Merge branch 'dev' of https://github.com/engaging-computing/MYR…
2598706 
… into dev"

This reverts commit 1ac632d, reversing
changes made to 7dd0f1f.
@samuel-zuk
Merge branch 'master' of github.com:samuel-zuk/MYR
b92c96b
@jasondkiesling
Merge pull request engaging-computing#233 from Jlu18/issue71-2
0435000 
Saving on course will auto populate the title and description of the Lesson on saving tab
@jasondkiesling
Merge branch 'master' of https://github.com/jswanson99/myr into test-229
7a4bbf9
@jasondkiesling
Merge branch 'dev' into master
636a1c4
@jasondkiesling
Merge pull request engaging-computing#229 from jSwanson99/master
42d5999 
Fixed makeUnPushable/unDroppable bug
@jasondkiesling
Added makeUnDroppable/Pushable back to reference
5ea0ccf
@jasondkiesling
Added makeUnDroppable/Pushable back to autocomplete
5598a63
@jasondkiesling
Merge branch 'dev' into master
0829692
@jasondkiesling
Merge pull request engaging-computing#235 from jasondkiesling/master
845e1c9 
Added makeUnDroppable and makeUnPushable back to documentation
@jasondkiesling
1.2.3 change log
8b13466
@jasondkiesling
1.2.3 change log
cc595a1
@samuel-zuk
changed appearance of render/stop buttons when on reference page
9b10828
jlu18 and others added 18 commits July 15, 2019 17:22
@jasondkiesling
modify autocomplete to pull function from reference
ebfd8f4
@jasondkiesling
fix indentation
fc1edd4
@jasondkiesling
Infinite loop detector
020f738
@jasondkiesling
Error for !=
552c312
@jasondkiesling
Fix !=
784e4a2
@jasondkiesling
Catch firebase image errors
6ca74c0
@jasondkiesling
Remove name and ID from settings for existing scenes
c7e0eaf
@jasondkiesling
v1.6.0
d22732c
@samuel-zuk
Merge branch 'dev' of https://github.com/engaging-computing/MYR into …
cdaddc1 
…courses-redesign
@samuel-zuk
Merge branch 'dev' of https://github.com/engaging-computing/MYR into …
8d88c31 
…courses-redesign
@samuel-zuk
working filter buttons
a4bc33f
@samuel-zuk
revised style of buttons
44f1d7e
@samuel-zuk
reset package.json, got rid of string concatenation warning
33e5899
@jasondkiesling
v1.6.1
2056cc0
@jasondkiesling
Fix classoom bug
79f232d
@jasondkiesling
Fix lint issue
ca8ab5c
@samuel-zuk
course select modal filtering functionality added
28ceb79
@samuel-zuk
Fixed button functionality, made modal not extend past viewport heigh…
a9ddb49 
…t, restructured CourseSelect.js
@jasondkiesling jasondkiesling changed the base branch from master to dev August 16, 2019 18:51
@samuel-zuk samuel-zuk requested a review from a team August 16, 2019 18:52
@jasondkiesling
Copy link
Member

Can you do a feature writeup on this? Then we can start the discussion.

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
@samuel-zuk @jasondkiesling @jSwanson99 @Jlu18 @elenaizotova