From 5955ead0760d88a4e2b450d724104f311725f955 Mon Sep 17 00:00:00 2001
From: Iman <oneweb@umich.edu>
Date: Wed, 27 Dec 2017 15:00:27 -0500
Subject: [PATCH 1/7] Modified layout.html to include a link to the practice
 page.

---
 .../_templates/plugin_layouts/sphinx_bootstrap/layout.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
index f11c9a0c7..4be63e1d9 100644
--- a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -140,7 +140,7 @@
           <ul class="dropdown-menu user-menu">
             <li><span class='loggedinuser'></span></li>
             <li class="divider"></li>
-            <li><a href='/{{appname}}/practice'>Practice</a></li>
+            <li><a href='{{course_url}}/{{appname}}/assignments/practice'>Practice</a></li>
             <li class="divider"></li>
             <li><a href='/{{appname}}/default/courses'>Change Course</a></li>
             <li class="divider"></li>

From dc20dc99ff2d1819079f898ef25abc8b1d170dee Mon Sep 17 00:00:00 2001
From: Iman <oneweb@umich.edu>
Date: Fri, 5 Jan 2018 18:21:37 -0500
Subject: [PATCH 2/7] Added the topics tag.

---
 runestone/common/runestonedirective.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runestone/common/runestonedirective.py b/runestone/common/runestonedirective.py
index 819ab0d41..8292f35f3 100644
--- a/runestone/common/runestonedirective.py
+++ b/runestone/common/runestonedirective.py
@@ -40,6 +40,7 @@ class RunestoneDirective(Directive):
                    'difficulty': directives.positive_int,
                    'autograde': directives.unchanged,
                    'practice': directives.unchanged,
+                   'topics': directives.unchanged,
                    }
 
     def __init__(self, *args, **kwargs):

From b516ebaf3a05f479c9e19b3aceee761038045d01 Mon Sep 17 00:00:00 2001
From: Paul Resnick <presnick@umich.edu>
Date: Fri, 5 Jan 2018 18:23:33 -0500
Subject: [PATCH 3/7] get rid of .DS_Store files that shouldn't be in the repo

---
 runestone/.DS_Store            | Bin 8196 -> 0 bytes
 runestone/activecode/.DS_Store | Bin 6148 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 runestone/.DS_Store
 delete mode 100644 runestone/activecode/.DS_Store

diff --git a/runestone/.DS_Store b/runestone/.DS_Store
deleted file mode 100644
index b7ba9800e9362849c7fc27b3db5a7b74f0afd19d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM!EVz)5S?w))F!IP0jWKqT#z_aC>4StA*3{vLvKhyfCMPD8@I7=?2tH3O9;w^
ze<+{8pYR9#0(U;3ycxUE+D;J%gerA6+MTui-tNrXvE6lvNHs^DEusw~vQXJpD`*xJ
zzRtB!meMn~VHNm9KE>3=?;iCFXmi3SU=%P47zK<1MuDrK0N&YLtV`be$yL)D1&jjM
zQUQKG)KJ+rQaekmJUY<G767({(^AmKK0r9N)HYH(ORP{aX0m%wDOIIg43*Gvy~c3Z
zMrvn?P3WW&I;nJKmF`fK%nn{n;G`OfHLX#=C{R>@_wE(hv-=cg_V1^AL3H2-kqZRh
zRF6^bo=ZXRg4H7jtZ=^T&$GVeST}$_z*hpFj>$tWq7Hf4nbi8<aNO~*pL+M*?Fara
zuGfF4rRCB}dDXIQ%U-kJwYt%`6+7{0*mMSO<jC)MZrXnlMZvu9xG#Ng+^*hw8ildr
zhu%PgzkTJ0ooL*QMqy_t<2-lbF1RvLyShG^JbX~!tZi>iH*1saZFC>i?@y<;wSH&o
z$=-hN^yB2y^z#|ZhDTHS2&0?H@x1+t-a>tjTZ1r&!XqZ5+R%{KinV7YBMNg0egR5f
zt1^&7{5)=R*k3s;d%#$qjxb9PoRH!yM{?mz%Y{{PDS#gb^d5Fm4(MnbxGrYt!+Vbg
z$N)DxzGQ&TSOX(~M?AhGb9uA_rbkYW$&u?!3mnNY@Hvu2(d+oK;CqO>pejeLEG=pa
zp7RPgbO_%te%2R4?q~32;C(3jfkp*Ckn<U=4eS6T^BQn3qJDOCg-A0D3-O(#iiThY
zIXu=mgD;8KabA0g@<fZWBsqX6v*Ss0I&Kx~>A=$=E4MH{9bE!Cf@XOyIVv4ziCUbu
zi!+_0((z@<3VyZ}6p+Y%YLS&OD(4@g2MeOpu@zvu@OU8WjreF>WO3dqon@sg#vT_v
zk~P%v6&c+{hI?4`7LG<(rNgXmieuJURiKh*H{VaJR2w7kUF^x1*!=y7JYIUO>2Q<t
z5%?qEchLLuy^pNUuvZY74{tq+a(+UM3=+4dDOX5=<;0f_-v2+l{QLhE^4Pdy6fg?>
zYXwwkx3$~Es26{j<|p92b`5nOl?&r$i4_VO*^a}?b{uy84@2~8fHJ3%+F4?82Iaqh
W2#^<_Ol{u(=c0po|BDRQtN9I^csy4C

diff --git a/runestone/activecode/.DS_Store b/runestone/activecode/.DS_Store
deleted file mode 100644
index c77623c7c850f7a552c3a000e930f50a4041606f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Z}496uoW(By<X0AeCh{NGwKGD+EPCNTGBVvp_-=!2(bxX$lR>Bvq468A?$$
z{KN1G{0V=+hwuS#{1}wSbcKXa<y+aucJA@x<i@Uvhz*v0kElgNCK5;EDzXcVKj*1p
zHPzAtGSNpsDUI>#(7fWU8?*vif&Wbb{_QrzHycny`S17iFpMW&7<=&G+rtB-+rNaN
zM6`D?izY=L`vTvy9IrtxO|VZ)DM8+$8S-Nai!AyER(`amVg+;p=7eJMfqb7S&6BlD
z%xl}3mAU>b&9#n^5=x456D!Kktw!%FKD?)jkGD$ZO40A$JPeYw+x@|6b>q_IE2d?c
zR?~Vjn#HS8>ZZ$N;4WT?THsGTRem1F;h(bWy$GhOaqGt8I7;0hnl5tguU`g{AFl@S
zGV&AA&r>&@fhz_Yx7zFVy}R9gyWiXF+v|QG#rxemn~i0*Z}lD?9vz>4Tz}epKEpa-
z4EwvV>k7}|D+*%$C!<9a#?d>}xvxdf=zt#4ke&cLc*A~CMG;T=xG>IRqU6UTA@8>*
z{5~Lmi+G(<h)CEL2YFs|8?PJ%d}hqdMJy(;lcwIO+1Sa|=|yP;v;u#l0N)>MB#w^4
zOrqF2kcle*&_J^=l=+_p&ao9b3Nwj#0%MX2lvJj!7);X9ZYw`WVJ1=1iK)v6QzJ8V
zLt$cc^luAyVva<eYX!6dMFr}z+T!Q`!S?%qk)&%{0j<DJDZq^3XgI)<)Y)2D96xJq
uq$4D5+%J<TD9F@tEDHQ6zKJ9Z&um@*Itnw1Xo2ZJ0zw9zX$AhN0>1%U&Ez!z


From 1e0930bc6f24e30ef812f9f915d8c93a0f3204e7 Mon Sep 17 00:00:00 2001
From: Iman <oneweb@umich.edu>
Date: Fri, 5 Jan 2018 18:25:02 -0500
Subject: [PATCH 4/7] Removed unnecessary files and folders.

---
 .DS_Store                      | Bin 6148 -> 0 bytes
 runestone/.DS_Store            | Bin 8196 -> 0 bytes
 runestone/activecode/.DS_Store | Bin 6148 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 runestone/.DS_Store
 delete mode 100644 runestone/activecode/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 6c1964bcc8a28958b190001e46a42f8a7ba0431c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!AiqG5S?wSCWzRBP>;EI>!C%oUW8EV!JAOggG!s2VgoTNO={6t$!F*v`3L@v
zGrQYTX+0`dW?=SBW@mP@Z^Lc|07P>b)B(x>V4)HgY-|<?^^?v?!FY;@LXD9?3KC-I
z`J=gLcKk&KXzy$oz>szgX7(?+_ao_J@4J5=g-KegeTYJ_w6eNp*|ueG*w^j89JNy~
z9VSh0aH*ccpywO=Ov-3#d;WRY8+FQCM>0;mFzyXz!mlpEIFO^J9L7PS#yR!UKIW>4
zI^{~1?eEp9PNP1qI$5KE=0R<DJhrXMPW|wtd-wR1J&#{rHN67AL?xRBC-8>Gf|Ulz
zP2}UdQrd#<hxQ<jWPFRglYu7#GBN|q05h<(444DWT3^}~@QX78%)n1EK<9&lO6VHQ
zHL9Zn8&v`zme8#PZK@?G$1&&{%r#;UiqNTuI#rkwL+Et$J0{LGm}}JOAWZQg%*?`6
zC_>GS<2x!GgsYKTW`G&^$^g}VC}q0;kH4?~RS-AK05kAE84#sbyVb<CnY(pvm2}rS
ts9jVNipw=lQ_xUXF~-tWyp5^^{SFz3uEAU*dQkXBK+(VrGw`bnd;+nETM7UG

diff --git a/runestone/.DS_Store b/runestone/.DS_Store
deleted file mode 100644
index b7ba9800e9362849c7fc27b3db5a7b74f0afd19d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM!EVz)5S?w))F!IP0jWKqT#z_aC>4StA*3{vLvKhyfCMPD8@I7=?2tH3O9;w^
ze<+{8pYR9#0(U;3ycxUE+D;J%gerA6+MTui-tNrXvE6lvNHs^DEusw~vQXJpD`*xJ
zzRtB!meMn~VHNm9KE>3=?;iCFXmi3SU=%P47zK<1MuDrK0N&YLtV`be$yL)D1&jjM
zQUQKG)KJ+rQaekmJUY<G767({(^AmKK0r9N)HYH(ORP{aX0m%wDOIIg43*Gvy~c3Z
zMrvn?P3WW&I;nJKmF`fK%nn{n;G`OfHLX#=C{R>@_wE(hv-=cg_V1^AL3H2-kqZRh
zRF6^bo=ZXRg4H7jtZ=^T&$GVeST}$_z*hpFj>$tWq7Hf4nbi8<aNO~*pL+M*?Fara
zuGfF4rRCB}dDXIQ%U-kJwYt%`6+7{0*mMSO<jC)MZrXnlMZvu9xG#Ng+^*hw8ildr
zhu%PgzkTJ0ooL*QMqy_t<2-lbF1RvLyShG^JbX~!tZi>iH*1saZFC>i?@y<;wSH&o
z$=-hN^yB2y^z#|ZhDTHS2&0?H@x1+t-a>tjTZ1r&!XqZ5+R%{KinV7YBMNg0egR5f
zt1^&7{5)=R*k3s;d%#$qjxb9PoRH!yM{?mz%Y{{PDS#gb^d5Fm4(MnbxGrYt!+Vbg
z$N)DxzGQ&TSOX(~M?AhGb9uA_rbkYW$&u?!3mnNY@Hvu2(d+oK;CqO>pejeLEG=pa
zp7RPgbO_%te%2R4?q~32;C(3jfkp*Ckn<U=4eS6T^BQn3qJDOCg-A0D3-O(#iiThY
zIXu=mgD;8KabA0g@<fZWBsqX6v*Ss0I&Kx~>A=$=E4MH{9bE!Cf@XOyIVv4ziCUbu
zi!+_0((z@<3VyZ}6p+Y%YLS&OD(4@g2MeOpu@zvu@OU8WjreF>WO3dqon@sg#vT_v
zk~P%v6&c+{hI?4`7LG<(rNgXmieuJURiKh*H{VaJR2w7kUF^x1*!=y7JYIUO>2Q<t
z5%?qEchLLuy^pNUuvZY74{tq+a(+UM3=+4dDOX5=<;0f_-v2+l{QLhE^4Pdy6fg?>
zYXwwkx3$~Es26{j<|p92b`5nOl?&r$i4_VO*^a}?b{uy84@2~8fHJ3%+F4?82Iaqh
W2#^<_Ol{u(=c0po|BDRQtN9I^csy4C

diff --git a/runestone/activecode/.DS_Store b/runestone/activecode/.DS_Store
deleted file mode 100644
index c77623c7c850f7a552c3a000e930f50a4041606f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Z}496uoW(By<X0AeCh{NGwKGD+EPCNTGBVvp_-=!2(bxX$lR>Bvq468A?$$
z{KN1G{0V=+hwuS#{1}wSbcKXa<y+aucJA@x<i@Uvhz*v0kElgNCK5;EDzXcVKj*1p
zHPzAtGSNpsDUI>#(7fWU8?*vif&Wbb{_QrzHycny`S17iFpMW&7<=&G+rtB-+rNaN
zM6`D?izY=L`vTvy9IrtxO|VZ)DM8+$8S-Nai!AyER(`amVg+;p=7eJMfqb7S&6BlD
z%xl}3mAU>b&9#n^5=x456D!Kktw!%FKD?)jkGD$ZO40A$JPeYw+x@|6b>q_IE2d?c
zR?~Vjn#HS8>ZZ$N;4WT?THsGTRem1F;h(bWy$GhOaqGt8I7;0hnl5tguU`g{AFl@S
zGV&AA&r>&@fhz_Yx7zFVy}R9gyWiXF+v|QG#rxemn~i0*Z}lD?9vz>4Tz}epKEpa-
z4EwvV>k7}|D+*%$C!<9a#?d>}xvxdf=zt#4ke&cLc*A~CMG;T=xG>IRqU6UTA@8>*
z{5~Lmi+G(<h)CEL2YFs|8?PJ%d}hqdMJy(;lcwIO+1Sa|=|yP;v;u#l0N)>MB#w^4
zOrqF2kcle*&_J^=l=+_p&ao9b3Nwj#0%MX2lvJj!7);X9ZYw`WVJ1=1iK)v6QzJ8V
zLt$cc^luAyVva<eYX!6dMFr}z+T!Q`!S?%qk)&%{0j<DJDZq^3XgI)<)Y)2D96xJq
uq$4D5+%J<TD9F@tEDHQ6zKJ9Z&um@*Itnw1Xo2ZJ0zw9zX$AhN0>1%U&Ez!z


From 94bf157dcde045cb6e7e08c406e48de0b23b63e6 Mon Sep 17 00:00:00 2001
From: Paul Resnick <presnick@umich.edu>
Date: Sun, 7 Jan 2018 17:02:22 -0500
Subject: [PATCH 5/7] make Parsons loadData even when in practice mode

---
 runestone/common/js/runestonebase.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/runestone/common/js/runestonebase.js b/runestone/common/js/runestonebase.js
index a6d6cf3c8..530f6ae89 100644
--- a/runestone/common/js/runestonebase.js
+++ b/runestone/common/js/runestonebase.js
@@ -67,11 +67,20 @@ RunestoneBase.prototype.checkServer = function (eventInfo) {
         if (!eBookConfig.practice_mode){
             jQuery.getJSON(eBookConfig.ajaxURL + "getAssessResults", data, this.repopulateFromStorage.bind(this)).error(this.checkLocalStorage.bind(this));
         }
+        else{
+            this.loadData({});
+        }
     } else {
         this.checkLocalStorage();   // just go right to local storage
     }
 };
 
+RunestoneBase.prototype.loadData = function (data){
+    // for most classes, loadData doesn't do anything. But for Parsons, and perhaps others in the future,
+    // initialization can happen even when there's no history to be loaded
+    return null;
+}
+
 RunestoneBase.prototype.repopulateFromStorage = function (data, status, whatever) {
     // decide whether to use the server's answer (if there is one) or to load from storage
     if (data !== null && this.shouldUseServer(data)) {

From 5e77ecacfddf2f30e19eb695361cd40ca43c2f20 Mon Sep 17 00:00:00 2001
From: Iman <oneweb@umich.edu>
Date: Mon, 8 Jan 2018 18:41:22 -0500
Subject: [PATCH 6/7] When clicking the 'Next Step' button in a Parson, we
 should disable the button till the animation is over. However, the code
 enabled the button immediately without waiting for the animation to end. I
 sloved the issue.

---
 runestone/showeval/js/showEval.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runestone/showeval/js/showEval.js b/runestone/showeval/js/showEval.js
index 2fa266622..98b8c024c 100644
--- a/runestone/showeval/js/showEval.js
+++ b/runestone/showeval/js/showEval.js
@@ -135,13 +135,13 @@ var SHOWEVAL = (function () {
                 if (thisShowEval.currentStep < thisShowEval.steps.length) {
                   thisShowEval.setStep(thisShowEval.currentStep);
                 }
+                $(buttonId).attr("disabled", false);
               }, 600);
             });
           });
         });
       }, 600);
     });
-    $(buttonId).attr("disabled", false);
     this.rb.logBookEvent({"event": "showeval", "act": 'next', "div_id": this.container[0].id});
 
   };

From 47e7c295704434878c634099ba524fa361ded603 Mon Sep 17 00:00:00 2001
From: Iman <oneweb@umich.edu>
Date: Mon, 10 Sep 2018 22:31:05 -0400
Subject: [PATCH 7/7] Fixed the timezone issue by having it in its original
 minutes scale.

---
 runestone/common/js/bookfuncs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runestone/common/js/bookfuncs.js b/runestone/common/js/bookfuncs.js
index 8eacbd4df..72e33f1b2 100644
--- a/runestone/common/js/bookfuncs.js
+++ b/runestone/common/js/bookfuncs.js
@@ -172,7 +172,7 @@ function isLoggedIn() {
 
 function handleLoginLogout() {
     if (shouldLogin()) {
-        data = {timezoneoffset: (new Date()).getTimezoneOffset()/60 }
+        data = { timezoneoffset: (new Date()).getTimezoneOffset() }
         jQuery.get(eBookConfig.ajaxURL + 'getuser', data, gotUser).error(notifyRunestoneComponents);
     } else {
         $(document).trigger("runestone:logout")