Skip to content

Conversation

@chrisrossi
Copy link
Contributor

This fixes a minor layout bug in edx-jsme 1.0. See:
jazkarta/edx-jsme#1

For convenience, the entire diff from the last release is included here:

diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..32e0284
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,13 @@
+===================
+edX-JSME Change Log
+===================
+
+1.0.1 (2014-09-17)
+------------------
+
+- Fix alignment issue with the correct/incorrect markers. (#1)
+
+1.0 (2014-07-28)
+----------------
+
+- Initial release.
diff --git a/edx_jsme/templates/jsmeinput.html b/edx_jsme/templates/jsmeinput.html
index 861b43f..5ceaf3d 100644
--- a/edx_jsme/templates/jsmeinput.html
+++ b/edx_jsme/templates/jsmeinput.html
@@ -38,6 +38,7 @@
waitfor=""
value="${value|h}"/>


This fixes a minor layout bug in edx-jsme 1.0. See:
jazkarta/edx-jsme#1

For convenience, the entire diff from the last release is included here:

diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..32e0284
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,13 @@
+===================
+edX-JSME Change Log
+===================
+
+1.0.1 (2014-09-17)
+------------------
+
+- Fix alignment issue with the correct/incorrect markers. (#1)
+
+1.0 (2014-07-28)
+----------------
+
+- Initial release.
diff --git a/edx_jsme/templates/jsmeinput.html b/edx_jsme/templates/jsmeinput.html
index 861b43f..5ceaf3d 100644
--- a/edx_jsme/templates/jsmeinput.html
+++ b/edx_jsme/templates/jsmeinput.html
@@ -38,6 +38,7 @@
     waitfor=""
     value="${value|h}"/>

+    <br/>
     <p id="answer_${id}" class="answer"></p>

     <p class="status">
@chrisrossi
Copy link
Contributor Author

Heads up @sarina

@sarina
Copy link
Contributor

sarina commented Sep 18, 2014

@chrisrossi thanks for this! Will you be available early next week to test this on our staging servers?

@chrisrossi
Copy link
Contributor Author

I suppose so. Do I have access to your staging servers?

Chris

On Thu, Sep 18, 2014 at 9:29 AM, Sarina Canelake notifications@github.com
wrote:

@chrisrossi https://github.com/chrisrossi thanks for this! Will you be
available early next week to test this on our staging servers?


Reply to this email directly or view it on GitHub
https://github.com/edx/edx-platform/pull/5271#issuecomment-56037736.

@sarina
Copy link
Contributor

sarina commented Sep 18, 2014

@chrisrossi I'll give it to you out-of-band. Feel free to send me an email - my github name at edx.org.

@sarina
Copy link
Contributor

sarina commented Sep 18, 2014

Build https://jenkins.testeng.edx.org/job/edx-all-tests-auto-pr/15636/ failed; I suspect tests are flaky but I'm running a manual build anyway. Will merge when it passes and/or I get feedback from testeng that the failures are indeed flakes.

@sarina
Copy link
Contributor

sarina commented Sep 18, 2014

😒 ugh those tests are flaky 😩

sarina added a commit that referenced this pull request Sep 18, 2014
Upgrade edx-jsme to the latest version.
@sarina sarina merged commit 59820f8 into openedx:master Sep 18, 2014
@sarina
Copy link
Contributor

sarina commented Sep 22, 2014

@chrisrossi just FYI we are not having a release this week; this will go out in next week's release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants