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

35473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
e593edffda Merge pull request #11690 from edx/revert-11644-omar/hide-tos 
Revert "Registration: don't require terms of service if checkbox is hidden"
 2016-02-29 12:16:15 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos 
Registration: don't require terms of service if checkbox is hidden
 2016-02-29 23:15:56 +07:00
Muddasser
bc2914eef4 Merge pull request #11655 from edx/muddasser-chrome-bokchoy-test_can_add_remove_allowance 
Test should wait for ajax calls to finish before checking the changes
 2016-02-29 18:46:08 +05:00
Awais Jibran
03585a4842 Merge pull request #11657 from edx/aj/ECOM3688-add-log-in-cert-gen 
Improve logging in certification generation
 2016-02-29 14:47:34 +05:00
raeeschachar
f09e9f020c Merge pull request #11672 from edx/raees/chrome-bokchoy-test-cancelling-redirects 
Fixed test_cancelling_redirects failing on Chrome
 2016-02-29 11:28:25 +05:00
Ben Patterson
953014cfb2 Merge pull request #11604 from edx/benp/lettuce-browser 
Dev user should be able to specify LETTUCE_BROWSER.
 2016-02-27 09:14:11 -05:00
Carol Tong
049fbb18fd Merge pull request #11668 from edx/carol/DOC-2703 
DOC-2703: replace instances of “courseware” in Advanced Settings help
 2016-02-26 17:33:33 -05:00
David Ormsbee
2e422b2caf Merge pull request #11492 from edx/ormsbee/inline_capa 
Move rendering of capa problems inline
 2016-02-26 17:23:51 -05:00
David Ormsbee
13682e4694 Cache edxmako request context computation. 
When capa problem rendering was moved to happen inline on courseware
page loads, we started executing many more Mako templates on sequences
with large numbers of thse problems. To help offset this, we're caching
the context generation (it showed up as the easiest piece of low
hanging fruit on profiles of the courseware index page).

[PERF-261]
 2016-02-26 16:15:07 -05:00
David Ormsbee
9984bbc29a Make Capa problems do initial load without AJAX. 
Before this commit, calling the student_view on a capa problem would
cause it to render an empty placeholder <div>, wait for the
DOMContentLoaded event to be fired, and then make AJAX requests to the
the problem_get handlers to retrieve the HTML it needed to render the
actual problems. This can significantly increase the end user load
times for pages, particularly when there are many problems in a
vertical.

This commit takes a very conservative approach and has the server side
add the rendered HTML into a new data-content attribute on the <div>
enclosing the problem. When Capa's JS initialization runs, it grabs
from that data-content attribute rather than reaching over the network
for an AJAX request.

I had attempted to make it somewhat smarter and push the rendered
problem straight into the document instead of relying on the
data-content attribute. This was faster, and should be our long term
goal. However, it caused odd bugs, particularly around MathJAX
rendering, and I never quite tracked the issue down. I'm still going
forward with these changes because it's significantly better than the
current situation that students have to deal with, and we can make the
JS more performant in a future iteration.

[PERF-261]
 2016-02-26 16:15:07 -05:00
Carol Tong
cc0c577884 Replace instances of courseware in Advanced Settings help with "course" 2016-02-26 15:20:29 -05:00
Matt Drayer
890d1bfd66 Merge pull request #11505 from eduNEXT/fmo/condition_microsite_enable_pre 
Use has_configuration_set() during microsite initialization
 2016-02-26 14:26:26 -05:00
Braden MacDonald
daadc1e4bc Merge pull request #11674 from edx/revert-11433-smarnach/studio-add-xblock 
Revert "Pass DOM element, not jQuery object to XBlock initialisation."
 2016-02-26 10:17:15 -08:00
Eric Fischer
9d0ce13884 Merge pull request #11667 from edx/efischer/ora_release 
Weekly ORA release
 2016-02-26 12:16:44 -05:00
Felipe Montoya
2c7ddb1d15 Delegating the conditional to the has_configuration_Set method, which is overriden by the database backend, so the enable_pre_startup works well for both backends. 
Adding tests

Fix quality issues
 2016-02-26 12:11:44 -05:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Nimisha Asthagiri
e5108dc7c6 Merge pull request #11673 from edx/mobile/undo_facebook_url_removal 
Course Overview migrations fix: Readd the Facebook URL field
 2016-02-26 11:49:54 -05:00
Eric Fischer
78c879341f Weekly ORA release 
Now installing without `-e`, and moving to a fully released 1.0.0 version
Also includes updating edx-submissions to a 1.0.0 release.
 2016-02-26 11:19:50 -05:00
raeeschachar
b4cbc66d96 Fixed test_cancelling_redirects failing on Chrome 2016-02-26 21:12:32 +05:00
Nimisha Asthagiri
33e47d317b Course Overview migrations fix: Readd the Facebook URL field. 2016-02-26 10:20:36 -05:00
Ben Patterson
34e41449c7 Clean up based on feedback. 2016-02-26 09:26:04 -05:00
Ben Patterson
9513107857 Dev user should be able to specify LETTUCE_BROWSER. 2016-02-26 09:26:03 -05:00
Alison Hodges
4653301516 Merge pull request #11649 from edx/ahodges/DOC-2720p 
Syncs preface with edx-doc repo version
 2016-02-25 14:09:39 -05:00
Eric Fischer
adb8896174 Merge pull request #11658 from edx/laq/multiple_login_failures 
Avoid MultipleObjectsReturned errors with LoginFailures
 2016-02-25 13:59:32 -05:00
Peter Pinch
3be2737f5b Merge pull request #11356 from mitocw/gdm_ccx_course_modules_#170 
Added extra field to CCX model for Course Models
 2016-02-25 13:45:15 -05:00
Ned Batchelder
c913734a47 Merge pull request #11610 from edx/ned/edx-lint-0.4.2 
Upgrade edx-lint to 0.4.2
 2016-02-25 13:40:23 -05:00
Alison Hodges
8057903556 Syncs preface and browsers file with edx-doc repo version 2016-02-25 12:27:28 -05:00
Eric Fischer
8442e4d1a8 Add laq in Authors List (replay) 
Replayed by @efischer19 due to git issues, initially commited by @laq
 2016-02-25 12:03:31 -05:00
Eric Fischer
97ac2845c1 Fix for LoginFailure.MultipleObjectsReturned in is_user_locked_out (replay) 
The get_or_create function is vulnerable to race conditions in MySQL, which can
cause the model LoginFailure to, in some cases, have more than one row for the
same user, breaking the login for that user.

Addinf functionality to expect and clean the error by deleting extra rows (by
oldest lockout date), leaving just one entry and allowing the user to login.

Replayed and squashed by @efischer19, initially commited by @laq
 2016-02-25 12:03:28 -05:00
sanfordstudent
c518543cbd Merge pull request #11602 from edx/sstudent/MA-1919 
MA-1919 making mobile handout links accommodate jump to id's and cour…
 2016-02-25 11:07:58 -05:00
Douglas Hall
4bad8881e5 Merge pull request #11659 from edx/douglashall/release_edx_proctoring_0_12_11 
Incremented edx-proctoring version to 0.12.11
 2016-02-25 10:58:45 -05:00
Mushtaq Ali
78b6983666 Merge pull request #11597 from edx/mushtaq/ECOM-3760-fix-self-paced-subsection-config 
Fix subsection config for self-paced course
 2016-02-25 20:50:07 +05:00
Ned Batchelder
3fa573d795 Use edx-lint 0.4.2 2016-02-25 10:41:24 -05:00
Giovanni Di Milia
0c637cdca9 Added extra field to CCX model for Course Models 
REST APIs modified
 2016-02-25 10:27:39 -05:00
Sanford Student
75a26b62b5 MA-1919 making mobile handout links accommodate jump to id's and course links 2016-02-25 10:20:13 -05:00
Douglas Hall
ba992214a5 Incremented edx-proctoring version to 0.12.11 2016-02-25 09:40:57 -05:00
John Eskew
e3ddb02cc7 Merge pull request #11586 from edx/jeskew/remove_all_request_dot_request 
Remove all request.REQUEST usages.
 2016-02-25 08:23:12 -05:00
Awais Jibran
d18f3f6c98 Improve logging in cert gen. 
ECOM-3688
 2016-02-25 14:57:31 +05:00
M. Rehan
db5fe13070 Merge pull request #11624 from edx/mrehan/topic-not-found-tnl-4136 
TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters in topic ID
 2016-02-25 13:13:26 +05:00
Muddasser
1e8163e283 Test should wait for ajax calls to finish before checking the changes 2016-02-25 12:43:08 +05:00
Brian Beggs
0251e8e15a Merge pull request #11545 from mitocw/feature/aq/support_mutiple_instances_ccx_mitocw#175 
Allow multiple instances of ccx
 2016-02-24 21:22:29 -05:00
Ned Batchelder
71e0ce7a0b Merge pull request #11652 from edx/ned/yaml-safe-load 
Use yaml.safe_load, since we have no need for the greater power of .load
 2016-02-24 20:06:43 -05:00
Michael Frey
860dd1bd5a Merge pull request #11651 from edx/release 
Release
 2016-02-24 16:15:16 -05:00
Peter Desjardins
0f3b99182e Merge pull request #11642 from edx/pdesjardins/DOC-2638 
Fix build failures in the docs/en_us/platform_api guide.
 2016-02-24 15:47:07 -05:00
Ned Batchelder
a9ab395d43 Use yaml.safe_load, since we have no need for the greater power of .load 2016-02-24 15:36:04 -05:00
Michael Frey
70ad954eec Merge pull request #11648 from edx/patch/2016-02-24 
Only allow ecommerce checkout if user is also activated
 2016-02-24 15:08:23 -05:00
Ned Batchelder
ca4729c221 Merge pull request #11650 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-02-24 14:32:43 -05:00
Douglas Hall
b4a172961b Merge pull request #11600 from edx/ibrahimahmed443/SOL-1611 
add student email in credit service
 2016-02-24 14:30:15 -05:00
Braden MacDonald
c90601556c Merge pull request #11635 from open-craft/braden/dndv2-version-bump 
Use latest version of drag and drop xblock
 2016-02-24 11:10:44 -08:00