Commit Graph

39204 Commits

Author SHA1 Message Date
Usman Khalid
2586f09d7a Add option to disable migrations when running tests
By default, migrations are applied as they always have been. Exporting DISABLE_MIGRATIONS=1 or passing --disable-migrations to Paver commands will create tables directly from apps' models.
2016-02-29 11:47:32 -05:00
Adam
62ccef69cc Merge pull request #11685 from edx/hotfix/2016-02-29
Revert "Pass DOM element, not jQuery object to XBlock initialisation."
2016-02-29 11:16:06 -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
lenacom
236cf4e30d removed check for 'root' 2016-02-29 19:12:44 +03: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
Braden MacDonald
76e66ff30f Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-29 08:39:19 -05:00
lenacom
f048a28fa0 added ending comma 2016-02-29 16:23:15 +03:00
lenacom
ae439310e1 New optional parameters for course blocks API: lti_url, block_types 2016-02-29 15:58:05 +03:00
Mushtaq Ali
3dc73c655b Display studio name properly on empty course page. 2016-02-29 17:11:55 +05:00
Ayub-khan
4b81f0bb3c Fix progress exception for credit courses and add unit test. 2016-02-29 15:42:20 +05:00
Qubad786
55ab52ea9f Configure code jail for cms 2016-02-29 15:22:52 +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
Douglas Hall
58e1047a3e Incremented edx-proctoring version for 0.12.12 release 2016-02-27 16:53:42 -05:00
Ben Patterson
18e1aaa320 Ensuring page is loaded belongs in the page object.
TNL-4151 had previously been fixed to avoid a flaky condition; however,
that only passed the flaky condition to a later point in the
test. The proper fix is to ensure the page has loaded. Putting the
definition in this method will mean that the page will wait
to load with other functions, such as `DashboardPage.visit()`.
2016-02-27 12:37:20 -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
Ned Batchelder
a7a1affb6d Merge pull request #11676 from edx/jibsheet/facebook_url_noop_migration
Noop the 0008 and conditional the 0009 migration
2016-02-26 19:47:18 -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
Kevin Falcone
7a129b0e9f Noop the 0008 and conditional the 0009 migration
We removed a column in the same release that we removed it
from the model.  This creates a gap where the code still looks for
a column which has been dropped until the new code has been deployed.

The initial fix was to put the column back, but that creates a window
during the alterations where views will error.

This noops the 0008 migration and effectively noops 0009 unless you've
run the old migration.
2016-02-26 17:14:12 -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
Christine Lytwynec
5ef52633b6 add aria-controls to buttons and remove label from dropdown container 2016-02-26 09:02:51 -05:00
John Eskew
e87bb74c22 Add app_label to models to prevent Django1.9 warnings. 2016-02-25 17:34:31 -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