Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,779 Commits 1 Branch 0 Tags
1e2ce7bd9482cc65bb69d254a4da445fecd40c1b
Commit Graph

25779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rossi
1e2ce7bd94 Upgrade edx-jsme to the latest version. 
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">
 2014-09-17 16:48:23 -04:00
Sarina Canelake
1152555614 Merge pull request #5253 from mitocw/bdero/fix-psychometrics-opaque-keys 
Fixed problems with psychometrics (Opaque Keys)
 2014-09-17 12:50:43 -04:00
Ben Patterson
1cd2d550a0 Merge pull request #5261 from edx/benp/fix-paver-failures 
Update paver bok_choy (test) commands to reflect new default vars.
 2014-09-17 12:38:44 -04:00
Sarina Canelake
dd04813aab Merge pull request #5096 from marcore/bypass-activation-email-extauth 
Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True
 2014-09-17 12:03:49 -04:00
Brandon DeRosier
efa4400342 Fixed problems with psychometrics 
- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.
 2014-09-17 11:25:00 -04:00
Ben Patterson
1d4ce68d2f Update paver bok_choy (test) commands to reflect new default vars. 2014-09-17 11:06:44 -04:00
zubair-arbi
eefd9f23a5 Merge pull request #5243 from edx/zub/bugfix/tnl-392-videocontrolstestfailure 
wait for notification on adding video component
 2014-09-17 19:40:48 +05:00
clytwynec
3f5b829d0e Merge pull request #5147 from edx/clytwynec/auto_capture_har_on_error 
enable auto-capturing of hars in bok-choy tests
 2014-09-17 09:15:20 -04:00
Ned Batchelder
1a7009ec1f Merge pull request #5251 from edx/ned/revert-lti-username-email 
Revert "username and email request for lti module"
 2014-09-17 06:59:42 -04:00
Tim Babych
d9df388855 Merge pull request #5221 from edx/tim/sourcemaps-debug-only 
Do not generate CSS source maps in production
 2014-09-17 13:37:55 +03:00
marcore
686aa3af82 Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True 2014-09-17 11:30:27 +02:00
Ben Patterson
fedba149d2 Merge pull request #5118 from edx/benp/paver-tests 
Add tests for paver bok_choy commands
 2014-09-16 20:32:15 -04:00
Ned Batchelder
4edeeb72c2 Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-16 16:13:41 -04:00
Ben Patterson
ae20b10608 Set paver command tests to run as part of unit test lib suites. 2014-09-16 15:20:22 -04:00
Ben Patterson
896764c9c2 Merge pull request #5242 from edx/benp/testing-doc 
Use new bok_choy file paths in paver examples.
 2014-09-16 15:18:03 -04:00
jmclaus
43ce6421cf Merge pull request #5059 from edx/anton/add-video-context-menu 
BLD-1230: Video Link Obfuscation
 2014-09-16 19:18:16 +02:00
Jim Abramson
32a45e1978 Merge pull request #5227 from edx/jsa/tnl153 
allow TAs to select the cohort of new posts.
 2014-09-16 12:46:13 -04:00
jsa
eef28a4f25 allow TAs to select the cohort of new posts. 
TNL-153
 2014-09-16 12:44:41 -04:00
polesye
2997a80aa5 Video link obfuscation. [BLD-1230] 2014-09-16 18:13:07 +02:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption 
Ex-74 Registration Code redemption
 2014-09-16 11:58:42 -04:00
Piotr Mitros
5b61a53439 Merge pull request #5215 from edx/pmitros/pyfilesystem-vpc-fixup 
Pyfilesystem fix for AWS. pyfs has broken logic which did not work with AWS roles-based auth. This removes that logic.
 2014-09-16 11:44:35 -04:00
Jesse Zoldak
f31768b690 Merge pull request #5207 from edx/waheed/tnl284-fix-flaky-test 
Fixed bok choy flaky test for studio.
 2014-09-16 11:41:13 -04:00
chrisndodge
9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue 
EX-81 / Ex-84 changes
 2014-09-16 11:17:40 -04:00
Sarina Canelake
8f6eedec3f Merge pull request #5247 from edx/sarina/09162014-translation-update 
Update translations (autogenerated message)
 2014-09-16 10:56:19 -04:00
Sarina Canelake
b618516dc1 Update translations (autogenerated message) 2014-09-16 10:54:09 -04:00
Piotr Mitros
98ef21a9cb Pyfilesystem fix for AWS 2014-09-16 09:45:42 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Don Mitchell
651ee94515 Merge pull request #5232 from edx/split/asset_charset 
Update github for asset char
 2014-09-16 09:40:06 -04:00
Don Mitchell
6a26e9c186 Update github for asset char 
LMS-11380
 2014-09-16 09:05:38 -04:00
Tim Babych
12f280b62a [TNL-198] Do not generate JS and CSS source maps in production 2014-09-16 15:39:09 +03:00
zubair-arbi
b2b46332f8 wait for notification on adding video component 
TNL-392
 2014-09-16 17:20:31 +05:00
Ben Patterson
b7b4760074 Merge pull request #5175 from edx/benp/solano2-jstest-failure 
TE-468 JS test: Use the correct array for validating onSeek logs
 2014-09-16 08:09:41 -04:00
Waheed Ahmed
8efa9daec1 Fixed bok choy flaky test for studio. 
TNL-284
 2014-09-16 16:04:08 +05:00
Muhammad Shoaib
739d2f0906 Ex-74 Registration Code redemption 
fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations
 2014-09-16 07:48:21 +00:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard 
only redirect to dashboard if user has course enrollments, otherwise rem...
 2014-09-15 22:06:13 -04:00
Mark Hoeber
c6bbae3903 Merge pull request #5126 from edx/markhoeber-doc408 
Updated Files & Uploads template help
 2014-09-15 22:03:11 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root) 
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
 2014-09-15 20:52:44 -04:00
Mark Hoeber
77311e03c9 Updated Files & Uploads template help 
To include size warning of 10 MB.  Also updated styling on existing learn more
links
 2014-09-15 20:14:33 -04:00
Ben Patterson
fa8dbbe5c9 Use new bok_choy file paths in paver examples. 2014-09-15 17:03:26 -04:00
Don Mitchell
032ff1cd61 Merge pull request #5200 from edx/split/lms-11396 
Updating active_versions should not send old and new
 2014-09-15 16:44:10 -04:00
Alison Hodges
bc952d4868 Merge pull request #5225 from edx/ahodges/doc/glossary_adds 
Ahodges/doc/glossary adds
 2014-09-15 16:40:29 -04:00
Alison Hodges
c41fab6208 Quick add for Wendy & Anant post webinar 2014-09-15 16:40:03 -04:00
Jason Bau
eab1d739be Merge pull request #5203 from Stanford-Online/kluo/fix-unicode-email 
Convert unicode emails to byte strings for CSV grade reports
 2014-09-15 13:32:55 -07:00
Don Mitchell
8d368eda13 Merge pull request #5201 from edx/split/lms-11395 
Split/lms 11395
 2014-09-15 16:31:03 -04:00
Don Mitchell
043c08bf5b Updating active_versions should not send old and new 
but just use old to get query info.
LMS-11396
 2014-09-15 16:02:53 -04:00
Don Mitchell
7090ef6588 Ensure deleting a direct only removes it from published 
as well as draft
LMS-11395
 2014-09-15 16:00:02 -04:00
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries 
Explain query counts
 2014-09-15 15:57:11 -04:00
Christine Lytwynec
4b5b72a39d add promise to get around race condition in discussion bok-choy test 2014-09-15 15:28:54 -04:00
Don Mitchell
6568463513 Merge pull request #5223 from edx/bug/lms-11361 
Bug/lms 11361
 2014-09-15 15:25:26 -04:00
Sarina Canelake
1e1fc127e2 Merge pull request #5214 from edx/sarina/update-i18n-tooling 
Sarina/update i18n tooling
 2014-09-15 14:39:15 -04:00