Commits · 22785e96fc21ca18da560f445b680d00c8a83d0c · edx / edx-platform

18 Sep, 2014 11 commits
- 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
- 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 12 commits

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

Merge pull request #5253 from mitocw/bdero/fix-psychometrics-opaque-keys · 11525556
```
Fixed problems with psychometrics (Opaque Keys)
```
Sarina Canelake committed Sep 17, 2014
11525556 Browse Files
Merge pull request #5261 from edx/benp/fix-paver-failures · 1cd2d550
```
Update paver bok_choy (test) commands to reflect new default vars.
```
Ben Patterson committed Sep 17, 2014
1cd2d550 Browse Files
Merge pull request #5096 from marcore/bypass-activation-email-extauth · dd04813a
```
Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True
```
Sarina Canelake committed Sep 17, 2014
dd04813a Browse Files

Fixed problems with psychometrics · efa44003

- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.

committed Sep 17, 2014

efa44003 Browse Files

Update paver bok_choy (test) commands to reflect new default vars. · 1d4ce68d
Ben Patterson committed Sep 17, 2014

1d4ce68d Browse Files
Merge pull request #5243 from edx/zub/bugfix/tnl-392-videocontrolstestfailure · eefd9f23
```
wait for notification on adding video component
```
zubair-arbi committed Sep 17, 2014
eefd9f23 Browse Files
Merge pull request #5147 from edx/clytwynec/auto_capture_har_on_error · 3f5b829d
```
enable auto-capturing of hars in bok-choy tests
```
clytwynec committed Sep 17, 2014
3f5b829d Browse Files
Merge pull request #5251 from edx/ned/revert-lti-username-email · 1a7009ec
```
Revert "username and email request for lti module"
```
Ned Batchelder committed Sep 17, 2014
1a7009ec Browse Files
Merge pull request #5221 from edx/tim/sourcemaps-debug-only · d9df3888
```
Do not generate CSS source maps in production
```
Tim Babych committed Sep 17, 2014
d9df3888 Browse Files
Disable sending activation email also when doing external_auth and setting… · 686aa3af
```
Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True
```
marcore committed Sep 17, 2014
686aa3af Browse Files
Merge pull request #5118 from edx/benp/paver-tests · fedba149
```
Add tests for paver bok_choy commands
```
Ben Patterson committed Sep 16, 2014
fedba149 Browse Files

16 Sep, 2014 17 commits
- Revert "username and email request for lti module" · 4edeeb72
```
This reverts commit 3f159ea5.
```
  Ned Batchelder committed Sep 16, 2014
  4edeeb72 Browse Files
- Set paver command tests to run as part of unit test lib suites. · ae20b106
  Ben Patterson committed Sep 16, 2014
  
  ae20b106 Browse Files
- Merge pull request #5242 from edx/benp/testing-doc · 896764c9
```
Use new bok_choy file paths in paver examples.
```
  Ben Patterson committed Sep 16, 2014
  896764c9 Browse Files
- Merge pull request #5059 from edx/anton/add-video-context-menu · 43ce6421
```
BLD-1230: Video Link Obfuscation
```
  jmclaus committed Sep 16, 2014
  43ce6421 Browse Files
- Merge pull request #5227 from edx/jsa/tnl153 · 32a45e19
```
allow TAs to select the cohort of new posts.
```
  Jim Abramson committed Sep 16, 2014
  32a45e19 Browse Files
- allow TAs to select the cohort of new posts. · eef28a4f
```
TNL-153
```
  jsa committed Sep 16, 2014
  eef28a4f Browse Files
- Video link obfuscation. [BLD-1230] · 2997a80a
  polesye committed Sep 16, 2014
  
  2997a80a Browse Files
- Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption · 7593ad3a
```
Ex-74 Registration Code redemption
```
  chrisndodge committed Sep 16, 2014
  7593ad3a Browse Files
- Merge pull request #5215 from edx/pmitros/pyfilesystem-vpc-fixup · 5b61a534
```
Pyfilesystem fix for AWS. pyfs has broken logic which did not work with AWS roles-based auth. This removes that logic. 
```
  Piotr Mitros committed Sep 16, 2014
  5b61a534 Browse Files
- Merge pull request #5207 from edx/waheed/tnl284-fix-flaky-test · f31768b6
```
Fixed bok choy flaky test for studio.
```
  Jesse Zoldak committed Sep 16, 2014
  f31768b6 Browse Files
- Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue · 9d683ed1
```
EX-81 / Ex-84 changes
```
  chrisndodge committed Sep 16, 2014
  9d683ed1 Browse Files
- Merge pull request #5247 from edx/sarina/09162014-translation-update · 8f6eedec
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Sep 16, 2014
  8f6eedec Browse Files
- Update translations (autogenerated message) · b618516d
  Sarina Canelake committed Sep 16, 2014
  
  b618516d Browse Files
- Pyfilesystem fix for AWS · 98ef21a9
  Piotr Mitros committed Sep 16, 2014
  
  98ef21a9 Browse Files
- EX-81 / Ex-84 changes · 47cd0f3e
  asadiqbal08 committed Sep 16, 2014
  
  47cd0f3e Browse Files
- Merge pull request #5232 from edx/split/asset_charset · 651ee945
```
Update github for asset char
```
  Don Mitchell committed Sep 16, 2014
  651ee945 Browse Files
- Update github for asset char · 6a26e9c1
```
LMS-11380
```
  Don Mitchell committed Sep 16, 2014
  6a26e9c1 Browse Files