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

Closed

samuel-zuk wants to merge 265 commits intoengaging-computing:devfrom samuel-zuk:courses-redesign

+165-12

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 7, 2019

updated subtractive geometry to work with groups
samuel-zuk
committed

Commits on Jun 14, 2019

Commits on Jun 18, 2019

Commits on Jun 25, 2019

GDPR compliant welcome screen with sidebar button (engaging-computing#286 )
jasondkiesling
authored
Merge branch 'dev' into master
jasondkiesling
authored
Fixed welcome scene typos
jasondkiesling
authored
1.3.0 change log updates
jasondkiesling
authored
Reference drawer title (engaging-computing#271 )

elenaizotova
authored and
jasondkiesling
committed
Merge branch 'dev' into master
jasondkiesling
authored
header logo (MYR) will now redirect to the new scene (engaging-computing#287 )

Jlu18
authored and
jasondkiesling
committed
1.3.0 change log - Add brand link
jasondkiesling
authored
Merge branch 'dev' of https://github.com/engaging-computing/MYR
samuel-zuk
committed
Merge branch 'master' of github.com:samuel-zuk/MYR
samuel-zuk
committed
Reference tab labels are now automatically hidden on extra-small screens (engaging-computing#275 )

samuel-zuk
authored and
jasondkiesling
committed
1.3.0 change log - Reference labels and view
jasondkiesling
authored
Added loading screen implementation (engaging-computing#274 )

jSwanson99
authored and
jasondkiesling
committed
Merge branch 'dev' of https://github.com/engaging-computing/MYR
samuel-zuk
committed
added ability to pass arrays to getRandomColor()
samuel-zuk
committed
cleaned up getRandomColor code
samuel-zuk
committed
cleaned up getRandomColor code
samuel-zuk
committed
getRandomColor() now checks for empty arrays and for no arguments. added test for getRandomColor() on an array
samuel-zuk
committed
added new array functionality within getRandomColor to the reference
samuel-zuk
committed

Commits on Jun 26, 2019

Commits on Jul 6, 2019

Commits on Jul 15, 2019

added makeSubtractive() function to enable subtractive geometry for MYR entities

samuel-zuk
authored and
jasondkiesling
committed
cleaned up makeSubtractive() function

samuel-zuk
authored and
jasondkiesling
committed
last commit broke subtractive geometry. this one fixes it.

samuel-zuk
authored and
jasondkiesling
committed
updated Reference.js and Myr.js

samuel-zuk
authored and
jasondkiesling
committed
added documentation for makeSubtractive/makeUnSubtractive in reference section

samuel-zuk
authored and
jasondkiesling
committed
changed wording in reference section

samuel-zuk
authored and
jasondkiesling
committed
slight change to addtive/subtractive mixins

samuel-zuk
authored and
jasondkiesling
committed
minor change to mixins, and also readded make(Un)Droppable() to the completer

samuel-zuk
authored and
jasondkiesling
committed
updated dependencies

samuel-zuk
authored and
jasondkiesling
committed
updated dependencies to use new fork of aframe-csg-meshs

samuel-zuk
authored and
jasondkiesling
committed
updated subtractive geometry to work with groups

samuel-zuk
authored and
jasondkiesling
committed
Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render, and added a loading screen/overlay while waiting for view to mount

jSwanson99
authored and
jasondkiesling
committed
Fixed formatting, moved render bug fix to state, removed loading screen changes

jSwanson99
authored and
jasondkiesling
committed
Resolved merge conflicts

jSwanson99
authored and
jasondkiesling
committed
Revert "Merge branch 'dev' of github.com:samuel-zuk/MYR"

samuel-zuk
authored and
jasondkiesling
committed
Revert "Merge branch 'dev' of https://github.com/engaging-computing/MYR into dev"

samuel-zuk
authored and
jasondkiesling
committed
Added makeUnDroppable/Pushable back to reference
jasondkiesling
committed
1.2.3 change log
jasondkiesling
committed
reverted merge conflicts

samuel-zuk
authored and
jasondkiesling
committed
Render button should behave properly/the same as crtl enter (engaging-computing#237 )

jSwanson99
authored and
jasondkiesling
committed
Fixed bug where view only toggle doesn't work in courses (engaging-computing#238 )

jSwanson99
authored and
jasondkiesling
committed
View only on RefEx, ctrl+shift+s rename, eslint, and formatting galore (engaging-computing#244 )
jasondkiesling
committed
Error handling for reference examples and add to eslint rules (engaging-computing#247 )
jasondkiesling
committed
Update change log 1.2.5
jasondkiesling
committed
Update version #
jasondkiesling
committed
Project view moved from drawer to tabbed modal (engaging-computing#260 )

elenaizotova
authored and
jasondkiesling
committed
Implemented welcome screen (engaging-computing#265 )
jasondkiesling
committed
Welcome screen never again button closes modal (engaging-computing#269 )
jasondkiesling
committed
1.3.0 change log
jasondkiesling
committed
added ability to pass arrays to getRandomColor()

samuel-zuk
authored and
jasondkiesling
committed
delete duplicate function (engaging-computing#304 )

Jlu18
authored and
jasondkiesling
committed
fixed bad merges from rebase

samuel-zuk
authored and
jasondkiesling
committed
merge conflict fix

samuel-zuk
authored and
jasondkiesling
committed
Update README.md

elenaizotova
authored and
jasondkiesling
committed
Update package.json

elenaizotova
authored and
jasondkiesling
committed
Update README.md
jasondkiesling
committed
added makeSubtractive() function to enable subtractive geometry for MYR entities

samuel-zuk
authored and
jasondkiesling
committed
cleaned up makeSubtractive() function

samuel-zuk
authored and
jasondkiesling
committed
last commit broke subtractive geometry. this one fixes it.

samuel-zuk
authored and
jasondkiesling
committed
updated Reference.js and Myr.js

samuel-zuk
authored and
jasondkiesling
committed
added documentation for makeSubtractive/makeUnSubtractive in reference section

samuel-zuk
authored and
jasondkiesling
committed
changed wording in reference section

samuel-zuk
authored and
jasondkiesling
committed
slight change to addtive/subtractive mixins

samuel-zuk
authored and
jasondkiesling
committed
minor change to mixins, and also readded make(Un)Droppable() to the completer

samuel-zuk
authored and
jasondkiesling
committed
updated dependencies

samuel-zuk
authored and
jasondkiesling
committed
updated dependencies to use new fork of aframe-csg-meshs

samuel-zuk
authored and
jasondkiesling
committed
updated subtractive geometry to work with groups

samuel-zuk
authored and
jasondkiesling
committed
Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render, and added a loading screen/overlay while waiting for view to mount

jSwanson99
authored and
jasondkiesling
committed
Fixed formatting, moved render bug fix to state, removed loading screen changes

jSwanson99
authored and
jasondkiesling
committed
Resolved merge conflicts

jSwanson99
authored and
jasondkiesling
committed
Revert "Merge branch 'dev' of github.com:samuel-zuk/MYR"

samuel-zuk
authored and
jasondkiesling
committed
Revert "Merge branch 'dev' of https://github.com/engaging-computing/MYR into dev"

samuel-zuk
authored and
jasondkiesling
committed
Added makeUnDroppable/Pushable back to reference
jasondkiesling
committed
1.2.3 change log
jasondkiesling
committed
reverted merge conflicts

samuel-zuk
authored and
jasondkiesling
committed
Render button should behave properly/the same as crtl enter (engaging-computing#237 )

jSwanson99
authored and
jasondkiesling
committed
Fixed bug where view only toggle doesn't work in courses (engaging-computing#238 )

jSwanson99
authored and
jasondkiesling
committed
View only on RefEx, ctrl+shift+s rename, eslint, and formatting galore (engaging-computing#244 )
jasondkiesling
committed
Error handling for reference examples and add to eslint rules (engaging-computing#247 )
jasondkiesling
committed
Update version #
jasondkiesling
committed
Project view moved from drawer to tabbed modal (engaging-computing#260 )

elenaizotova
authored and
jasondkiesling
committed
Implemented welcome screen (engaging-computing#265 )
jasondkiesling
committed
Welcome screen never again button closes modal (engaging-computing#269 )
jasondkiesling
committed
1.3.0 change log
jasondkiesling
committed
added ability to pass arrays to getRandomColor()

samuel-zuk
authored and
jasondkiesling
committed
delete duplicate function (engaging-computing#304 )

Jlu18
authored and
jasondkiesling
committed
refactored components that used componentWillRecieveProps() lifecycle handler

samuel-zuk
authored and
jasondkiesling
committed
scene description now should send properly to firebase

samuel-zuk
authored and
jasondkiesling
committed
fixed bad merges from rebase

samuel-zuk
authored and
jasondkiesling
committed
merge conflict fix

samuel-zuk
authored and
jasondkiesling
committed
Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render, and added a loading screen/overlay while waiting for view to mount

jSwanson99
authored and
jasondkiesling
committed
Fixed formatting, moved render bug fix to state, removed loading screen changes

jSwanson99
authored and
jasondkiesling
committed
Resolved merge conflicts

jSwanson99
authored and
jasondkiesling
committed
Render button should behave properly/the same as crtl enter (engaging-computing#237 )

jSwanson99
authored and
jasondkiesling
committed
Fixed bug where view only toggle doesn't work in courses (engaging-computing#238 )

jSwanson99
authored and
jasondkiesling
committed
View only on RefEx, ctrl+shift+s rename, eslint, and formatting galore (engaging-computing#244 )
jasondkiesling
committed
Project view moved from drawer to tabbed modal (engaging-computing#260 )

elenaizotova
authored and
jasondkiesling
committed
Implemented welcome screen (engaging-computing#265 )
jasondkiesling
committed
Reverted loading overlay (engaging-computing#273 )

jSwanson99
authored and
jasondkiesling
committed
delete duplicate function (engaging-computing#304 )

Jlu18
authored and
jasondkiesling
committed
conflict

jlu18
authored and
jasondkiesling
committed
rebase

jlu18
authored and
jasondkiesling
committed
rebase

jlu18
authored and
jasondkiesling
committed
modify autocomplete to pull function from reference

jlu18
authored and
jasondkiesling
committed
fix indentation

jlu18
authored and
jasondkiesling
committed
Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render, and added a loading screen/overlay while waiting for view to mount

jSwanson99
authored and
jasondkiesling
committed
Fixed formatting, moved render bug fix to state, removed loading screen changes

jSwanson99
authored and
jasondkiesling
committed
Resolved merge conflicts

jSwanson99
authored and
jasondkiesling
committed
Render button should behave properly/the same as crtl enter (engaging-computing#237 )

jSwanson99
authored and
jasondkiesling
committed
Fixed bug where view only toggle doesn't work in courses (engaging-computing#238 )

jSwanson99
authored and
jasondkiesling
committed
View only on RefEx, ctrl+shift+s rename, eslint, and formatting galore (engaging-computing#244 )
jasondkiesling
committed
Project view moved from drawer to tabbed modal (engaging-computing#260 )

elenaizotova
authored and
jasondkiesling
committed
Implemented welcome screen (engaging-computing#265 )
jasondkiesling
committed
Reverted loading overlay (engaging-computing#273 )

jSwanson99
authored and
jasondkiesling
committed
delete duplicate function (engaging-computing#304 )

Jlu18
authored and
jasondkiesling
committed
conflict

jlu18
authored and
jasondkiesling
committed
rebase

jlu18
authored and
jasondkiesling
committed
rebase

jlu18
authored and
jasondkiesling
committed
modify autocomplete to pull function from reference

jlu18
authored and
jasondkiesling
committed
fix indentation

jlu18
authored and
jasondkiesling
committed
Infinite loop detector
jasondkiesling
committed
Error for !=
jasondkiesling
committed
Fix !=
jasondkiesling
committed
Catch firebase image errors
jasondkiesling
committed
Remove name and ID from settings for existing scenes
jasondkiesling
committed
v1.6.0
jasondkiesling
committed

Commits on Jul 16, 2019

Merge branch 'dev' of https://github.com/engaging-computing/MYR into courses-redesign
samuel-zuk
committed

Commits on Aug 5, 2019

Merge branch 'dev' of https://github.com/engaging-computing/MYR into courses-redesign
samuel-zuk
committed

Commits on Aug 9, 2019

working filter buttons
samuel-zuk
committed

Commits on Aug 12, 2019

Commits on Aug 20, 2019

Commits on Aug 26, 2019

Merge branch 'dev' of https://github.com/engaging-computing/MYR into courses-redesign
samuel-zuk
committed