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

25824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
1f4ae3fb2b Updated help link and content of container page 2014-09-19 15:10:35 -04:00
Renzo Lucioni
135ce24977 Merge pull request #5248 from edx/renzo/cleanup-translated-strings 
Clean up translated strings in registration page, dashboard, and track selection flow
 2014-09-19 12:57:39 -04:00
srpearce
afc07cdac2 Merge pull request #5284 from edx/sylvia/docs/DOC-866 
Sylvia/docs/doc 866
 2014-09-19 11:00:35 -04:00
Sylvia Pearce
e00fa34fbb Added note about video URLs hidden by default 2014-09-19 10:59:51 -04:00
Clinton Blackburn
a5237a858e Merge pull request #5188 from edx/insights-staff-only 
Hiding Insights link for non-staff users
 2014-09-19 10:51:19 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
Piotr Mitros
4d640ee7e3 Merge pull request #4898 from edx/danielli/recommender_pyfs 
RecommenderXBlock with pyfs, better UX, and modification of logging
 2014-09-19 10:40:06 -04:00
swdanielli
165b015fe0 move to s3fs and handle one time url 2014-09-19 09:39:17 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
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.
 2014-09-18 17:59:12 -04:00
srpearce
c2c65c5db1 Merge pull request #5287 from edx/sylvia/docs/relnotes918revision 
Correct name of video option
 2014-09-18 16:11:16 -04:00
Sylvia Pearce
586d3ba45d Correct name of video option 2014-09-18 16:10:34 -04:00
David Baumgold
6325206d49 Merge pull request #4697 from edx/db/update-multiple-deps 
Upgrade scipy, lxml, boto, edx-ora2
 2014-09-18 15:16:04 -04:00
Ben Patterson
9f573f3413 Merge pull request #5282 from edx/benp/js-test-timeouts 
Disable flaky javascript tests TE-485
 2014-09-18 14:45:26 -04:00
Ben Patterson
c875f71573 Disable flaky javascript tests TL-439 2014-09-18 14:43:57 -04:00
David Baumgold
649288fc68 Update ora2 and submissions 2014-09-18 14:04:31 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Waheed Ahmed
22785e96fc Merge pull request #5258 from edx/waheed/tnl265-fix-fullscreen-functionality 
Fixed full screen functionality for image module in HTMLModule.
 2014-09-18 21:22:25 +05:00
srpearce
1d6d0f8006 Merge pull request #5268 from edx/sylvia/docs/relnotes_9_18 
Draft of 9-18 release notes
 2014-09-18 12:11:42 -04:00
Sylvia Pearce
d8e31da5f6 Release notes for September 18 2014-09-18 12:09:16 -04:00
Sarina Canelake
59820f811a Merge pull request #5271 from jazkarta/edx-jsme-1.0.1 
Upgrade edx-jsme to the latest version.
 2014-09-18 10:24:01 -04:00
Sarina Canelake
196bb3de6b Merge pull request #5275 from stvstnfrd/dashboard/analytics/hr 
Move <HR> inside of template conditional
 2014-09-18 10:12:57 -04:00
Waheed Ahmed
ef0af6e9d5 Fixed full screen functionality for image module in HTMLModule. 
TNL-265
 2014-09-18 19:00:44 +05:00
Sarina Canelake
3f23ce83b7 Update public_sandboxes.rst 2014-09-18 09:20:06 -04:00
Alison Hodges
7f492aa04f Merge pull request #5180 from edx/ahodges/doc/DOC-909 
Country and City fields in auth_userprofile
 2014-09-18 09:06:08 -04:00
Alison Hodges
b3ef93e575 Country and City fields in auth_userprofile 
ECOM-128 adds a country dropdown to student registration
 2014-09-18 09:05:36 -04:00
Usman Khalid
7bb0d5f5d8 Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions 
Added instructor persmission checking to _has_access_error_desc() in courseware.access
 2014-09-18 15:43:58 +05:00
stv
be8e01e5fe Move <HR> inside of template conditional 
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.
 2014-09-17 18:03:23 -07:00
Renzo Lucioni
c78594b286 Restore copy originally present on the registration page 2014-09-17 16:53:25 -04:00
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
Renzo Lucioni
66187ab907 Clean up translated strings in registration page, dashboard, and track selection flow 2014-09-17 14:38:24 -04:00
Andy Armstrong
6bf5207494 Merge pull request #5266 from edx/andya/remove-pr-5152 
Revert the changes from PR 5152
 2014-09-17 14:04:22 -04:00
Sarina Canelake
84671f8073 Merge pull request #5267 from lduarte1991/lduarte-harvardx-pr27 
Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging
 2014-09-17 13:46:10 -04:00
Carlos Andrés Rocha
35fdcf43b7 Merge pull request #5263 from rocha/rc-oauth2-provider 
Add edX OAuth2 provider with OpenID Connect support
 2014-09-17 13:25:47 -04:00
lduarte1991
bb4cfaba03 Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging 
- changed message and added i18n
 2014-09-17 13:00:37 -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
Andy Armstrong
7c4d8d3752 Revert the changes from PR 5152 
The changes in 5152 appear to have introduced a
 performance problem on stage, so we're going to
 revert them for now.
 2014-09-17 12:24:59 -04:00
chrisndodge
3943bbd7e9 Merge pull request #5260 from edx/cdodge/remove-edx-footer-for-microsites 
For microsites, since we don't have a footer override yet for django tem...
 2014-09-17 12:07:37 -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
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -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
Carlos Andrés Rocha
72651e64ad Modify notification_pref tests to avoid changes to module store 
Calling the client root was causing the module store to be modified,
affecting test in other Django applications that rely on the default
state of the module store.
 2014-09-17 11:16:55 -04:00
Carlos Andrés Rocha
276ea2fe84 Fix tests not using ModuleStoreTestCase 
Some tests test were using `CourseFactory` buy not deriving from
`ModuleStoreTestCase`, introducing a course leaks that broke other
unrelated tests.
 2014-09-17 11:16:55 -04:00
Ben Patterson
1d4ce68d2f Update paver bok_choy (test) commands to reflect new default vars. 2014-09-17 11:06:44 -04:00
Chris Dodge
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -04:00
David Baumgold
883c9cee84 Upgrade scipy, lxml, boto 2014-09-17 10:48:33 -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
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04:00