Merging the_practice_feature to the master. - #11

Open

ImanYZ wants to merge 15 commits into

presnick:masterfrom

Commits on Dec 27, 2017

Modified layout.html to include a link to the practice page.
ImanYZ
committed
5955ead

Commits on Jan 5, 2018

Merge remote-tracking branch 'upstream/master' into practice_feature
presnick
committed
d846eb6
Added the topics tag.
ImanYZ
committed
dc20dc9
Merge branch 'master' of git://github.com/ImanYZ/RunestoneComponents into ImanYZ-master
presnick
committed
f7878ec
get rid of .DS_Store files that shouldn't be in the repo
presnick
committed
b516eba
Merge branch 'ImanYZ-master' into practice_feature
presnick
committed
7e05061
Removed unnecessary files and folders.
ImanYZ
committed
1e0930b

Commits on Jan 7, 2018

Merge branch 'master' into practice_feature
presnick
committed
18d4ee1
make Parsons loadData even when in practice mode
presnick
committed
94bf157

Commits on Jan 8, 2018

Commits on Jan 9, 2018

Merge remote-tracking branch 'professorresnickmaster/practice_feature'
ImanYZ
committed
fb856e0

Commits on Feb 4, 2018

Merging the_practice_feature to the master.
ImanYZ
committed
1f5dc57

Commits on Aug 22, 2018

Merging with final changes in miller/master.
ImanYZ
committed
e4037b8

Commits on Sep 11, 2018

Fixed the timezone issue by having it in its original minutes scale.
ImanYZ
committed
47e7c29