Commits · 03d9a6fd2973377a9abc6351cd1276f90210c647 · edx / edx-platform

22 Sep, 2014 4 commits
- Merge pull request #5277 from edx/waheed/tnl413-fix-course-id-kwarg-on-merge-wiki · 03d9a6fd
```
Fixed wiki merge url regex.
```
  Waheed Ahmed committed Sep 22, 2014
  03d9a6fd Browse Files
- Fixed wiki merge url regex. · 3e64faea
```
TNL-413
```
  Waheed Ahmed committed Sep 22, 2014
  3e64faea Browse Files
- Merge pull request #4460 from edx/waheed/lms6617-disable-student-view-if-course-is-not-released · f827c538
```
Disabled student view if course is not yet released for students.
```
  Waheed Ahmed committed Sep 22, 2014
  f827c538 Browse Files
- Disabled student view if course is not yet released for students. · 3c8eacd4
```
LMS-6617
```
  Waheed Ahmed committed Sep 22, 2014
  3c8eacd4 Browse Files
19 Sep, 2014 11 commits
- Merge pull request #5302 from edx/release · 4aa2dc52
```
Release merge - post hotfix-2014-09-19-1
```
  John Eskew committed Sep 19, 2014
  4aa2dc52 Browse Files
- Merge pull request #5281 from edx/adam/hide-tabs-if-not-enrolled-rebase-2 · 81d8c40e
```
Deployed as hotfix
```
  John Eskew committed Sep 19, 2014
  81d8c40e Browse Files
- Merge pull request #5248 from edx/renzo/cleanup-translated-strings · 135ce249
```
Clean up translated strings in registration page, dashboard, and track selection flow
```
  Renzo Lucioni committed Sep 19, 2014
  135ce249 Browse Files
- Merge pull request #5284 from edx/sylvia/docs/DOC-866 · afc07cda
```
Sylvia/docs/doc 866
```
  srpearce committed Sep 19, 2014
  afc07cda Browse Files
- Added note about video URLs hidden by default · e00fa34f
  Sylvia Pearce committed Sep 19, 2014
  
  e00fa34f Browse Files
- Merge pull request #5188 from edx/insights-staff-only · a5237a85
```
Hiding Insights link for non-staff users
```
  Clinton Blackburn committed Sep 19, 2014
  a5237a85 Browse Files
- Hiding Insights link for non-staff users · 87056947
  Clinton Blackburn committed Sep 19, 2014
  
  87056947 Browse Files
- Merge pull request #4898 from edx/danielli/recommender_pyfs · 4d640ee7
```
RecommenderXBlock with pyfs, better UX, and modification of logging
```
  Piotr Mitros committed Sep 19, 2014
  4d640ee7 Browse Files
- update number of queries in embargo test · 0a385544
  Adam Palay committed Sep 19, 2014
  
  0a385544 Browse Files
- only load tabs if user is enrolled in course (TNL-286) · ac862b7a
```
add tests for static tabs
```
  Adam Palay committed Sep 19, 2014
  ac862b7a Browse Files
- move to s3fs and handle one time url · 165b015f
  swdanielli committed Sep 19, 2014
  
  165b015f Browse Files
18 Sep, 2014 23 commits
- Merge pull request #5129 from edx/ned/python-zip-assets · 10bd2b00
```
Python zip file importable from an asset
```
  Ned Batchelder committed Sep 18, 2014
  10bd2b00 Browse Files
- Importable python_lib.zip assets · 616bbbab
```
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
```
  Ned Batchelder committed Sep 18, 2014
  616bbbab Browse Files
- Merge pull request #5287 from edx/sylvia/docs/relnotes918revision · c2c65c5d
```
Correct name of video option
```
  srpearce committed Sep 18, 2014
  c2c65c5d Browse Files
- Correct name of video option · 586d3ba4
  Sylvia Pearce committed Sep 18, 2014
  
  586d3ba4 Browse Files
- Merge pull request #4697 from edx/db/update-multiple-deps · 6325206d
```
Upgrade scipy, lxml, boto, edx-ora2
```
  David Baumgold committed Sep 18, 2014
  6325206d Browse Files
- Merge pull request #5282 from edx/benp/js-test-timeouts · 9f573f34
```
Disable flaky javascript tests TE-485
```
  Ben Patterson committed Sep 18, 2014
  9f573f34 Browse Files
- Disable flaky javascript tests TL-439 · c875f715
  Ben Patterson committed Sep 18, 2014
  
  c875f715 Browse Files
- Update ora2 and submissions · 649288fc
  David Baumgold committed Sep 18, 2014
  
  649288fc Browse Files
- Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. · 9e830d08
  John Eskew committed Sep 18, 2014
  
  9e830d08 Browse Files
- Merge pull request #5258 from edx/waheed/tnl265-fix-fullscreen-functionality · 22785e96
```
Fixed full screen functionality for image module in HTMLModule.
```
  Waheed Ahmed committed Sep 18, 2014
  22785e96 Browse Files
- Merge pull request #5268 from edx/sylvia/docs/relnotes_9_18 · 1d6d0f80
```
Draft of 9-18 release notes
```
  srpearce committed Sep 18, 2014
  1d6d0f80 Browse Files
- Release notes for September 18 · d8e31da5
  Sylvia Pearce committed Sep 18, 2014
  
  d8e31da5 Browse Files
- display banner on course info page if user is not enrolled (TNL-286) · 1b06edb6
```
write failing tests for info page banner
```
  Adam Palay committed Sep 18, 2014
  1b06edb6 Browse Files
- redirect users from about page to info page when there is a marketing site (TNL-286) · e569e090
  Adam Palay committed Sep 18, 2014
  
  e569e090 Browse Files
- Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) · 7f4da141
  Adam Palay committed Sep 18, 2014
  
  7f4da141 Browse Files
- Merge pull request #5271 from jazkarta/edx-jsme-1.0.1 · 59820f81
```
Upgrade edx-jsme to the latest version.
```
  Sarina Canelake committed Sep 18, 2014
  59820f81 Browse Files
- Merge pull request #5275 from stvstnfrd/dashboard/analytics/hr · 196bb3de
```
Move <HR> inside of template conditional
```
  Sarina Canelake committed Sep 18, 2014
  196bb3de Browse Files
- Fixed full screen functionality for image module in HTMLModule. · ef0af6e9
```
TNL-265
```
  Waheed Ahmed committed Sep 18, 2014
  ef0af6e9 Browse Files
- Update public_sandboxes.rst · 3f23ce83
  Sarina Canelake committed Sep 18, 2014
  
  3f23ce83 Browse Files
- Merge pull request #5180 from edx/ahodges/doc/DOC-909 · 7f492aa0
```
Country and City fields in auth_userprofile
```
  Alison Hodges committed Sep 18, 2014
  7f492aa0 Browse Files
- Country and City fields in auth_userprofile · b3ef93e5
```
ECOM-128 adds a country dropdown to student registration
```
  Alison Hodges committed Sep 18, 2014
  b3ef93e5 Browse Files
- Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions · 7bb0d5f5
```
Added instructor persmission checking to _has_access_error_desc() in courseware.access
```
  Usman Khalid committed Sep 18, 2014
  7bb0d5f5 Browse Files
- Move <HR> inside of template conditional · be8e01e5
```
Otherwise, if `settings.ENABLE_INSTRUCTOR_ANALYTICS` is set to `False`,
two horizontal rules are rendered consecutively.

The <HR> has also been indented to align with surrounding tags.
```
  stv committed Sep 17, 2014
  be8e01e5 Browse Files
17 Sep, 2014 2 commits

Restore copy originally present on the registration page · c78594b2
Renzo Lucioni committed Sep 17, 2014

c78594b2 Browse Files

Upgrade edx-jsme to the latest version. · 1e2ce7bd

This fixes a minor layout bug in edx-jsme 1.0. See:
https://github.com/jazkarta/edx-jsme/issues/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">

committed Sep 17, 2014

1e2ce7bd Browse Files