Commits

Commits on Jun 14, 2020

Merge pull request #375 from vern97/dev
vern97
committedJun 14, 2020

Commits on Jun 7, 2020

Merge pull request #374 from Victoria-Rhine/v-add-credits
vern97
committedJun 7, 2020
Add credits page and final ERD
Victoria-Rhine
committedJun 7, 2020

Commits on Jun 6, 2020

Merge pull request #373 from MaxWOU/m-bug-fixes
vern97
committedJun 6, 2020

Commits on Jun 5, 2020

Merge branch 'dev' of https://github.com/vern97/Khronos into m-bug-fixes
MaxWOU
committedJun 5, 2020
final touches, icons... some functionality. now a professor can view and edit a calculator.
MaxWOU
committedJun 5, 2020

Commits on Jun 2, 2020

Merge pull request #372 from MaxWOU/m-bug-fixes
vern97
committedJun 2, 2020
another commit for icons, fixing some phrasing
MaxWOU
committedJun 2, 2020
another commit for icons, fixing some alignment
MaxWOU
committedJun 2, 2020
calculator nav bar changes.
MaxWOU
committedJun 2, 2020
added a dropdown for calculators so it's a little less confusing
MaxWOU
committedJun 2, 2020

Commits on Jun 1, 2020

added a bunch of icons.
MaxWOU
committedJun 1, 2020
added a sign out icon to logout option in nav-bar
MaxWOU
committedJun 1, 2020
fixed bars.
MaxWOU
committedJun 1, 2020
Merge pull request #371 from Victoria-Rhine/v-bug
vern97
committedJun 1, 2020
Fix bug for demo
Victoria-Rhine
committedJun 1, 2020
Merge pull request #370 from MaxWOU/m-bug-fixes
vern97
committedJun 1, 2020
added 1 more line, victoria's request.
MaxWOU
committedJun 1, 2020
added one more object test just for final measures, but that's about it.
MaxWOU
committedJun 1, 2020
and final touches.
MaxWOU
committedJun 1, 2020
removed bar charts :(
MaxWOU
committedJun 1, 2020
Merge pull request #369 from MaxWOU/m-bug-fixes
vern97
committedJun 1, 2020
Merge branch 'dev' of https://github.com/vern97/Khronos into m-bug-fixes
MaxWOU
committedJun 1, 2020
trying some other fixes for JS problem. Wondering if changing the JsonResult names will work or even the order in which the JS Callbacks are called.
MaxWOU
committedJun 1, 2020

Commits on May 31, 2020

Merge pull request #368 from vern97/revert-367-testing
vern97
committedMay 31, 2020
Revert "Just test whatever works"
vern97
committedMay 31, 2020
Merge pull request #367 from Victoria-Rhine/testing
vern97
committedMay 31, 2020
Just test whatever works
Victoria-Rhine
committedMay 31, 2020
Merge pull request #366 from MaxWOU/m-bug-fixes
vern97
committedMay 31, 2020
pushing beyond the tutor.csproj
MaxWOU
committedMay 31, 2020
Merge pull request #365 from MaxWOU/m-bug-fixes
vern97
committedMay 31, 2020
removed some bad code.
MaxWOU
committedMay 31, 2020
Merge pull request #364 from MaxWOU/m-bug-fixes
vern97
committedMay 31, 2020
some more additions and removals.
MaxWOU
committedMay 31, 2020
Merge pull request #363 from Victoria-Rhine/v-stuff
vern97
committedMay 31, 2020