Commit Graph

31439 Commits

Author SHA1 Message Date
Christine Lytwynec
45f487caa1 Merge pull request #8857 from edx/clytwynec/bok-choy-v0.4.3
update bok choy to version 0.4.3
2015-07-09 15:06:47 -04:00
David Baumgold
da5ad4fe04 Merge pull request #8161 from edx/distribute-to-setuptools
Distribute to setuptools
2015-07-09 15:00:20 -04:00
Sarina Canelake
07a3d74999 Merge pull request #8844 from ubc/xcompass/pu/fix-test_course_about_in_cart
Fix failed test_course_about_in_cart
2015-07-09 14:01:52 -04:00
David Baumgold
8a6e310d04 don't install ease in editable mode 2015-07-09 13:33:14 -04:00
David Baumgold
28433e1d53 Don't install nltk in editable mode 2015-07-09 13:31:18 -04:00
David Baumgold
a31f68520e Use compatible versions of edx-ora2 and ease 2015-07-09 13:05:09 -04:00
David Baumgold
705fa6999a Use a forked version of NLTK
So that we can use setuptools instead of distribute
2015-07-09 13:04:33 -04:00
Régis Behmo
95ebf7f675 Upgrade distribute to the latest stable version of setuptools
'distribute' is the ancestor of 'setuptools', and many packages require
setuptools to be installed.

Upgrade of MySQL-python from 1.2.4 to 1.2.5 is required because of an
incompatibility with setuptools>0.7.
2015-07-09 13:04:33 -04:00
Pan Luo
eddf83a48d Update AUTHORS 2015-07-09 10:01:40 -07:00
zubair-arbi
1574650f28 Merge pull request #8845 from edx/tasawer/story/ecom-1651-on-demand-cert-download-update
Update copy for On Demand Cert Download
2015-07-09 21:08:47 +05:00
David Ormsbee
472de1a5de Merge pull request #7288 from edx/ormsbee/grade_query_caching
Grading Performance Work
2015-07-09 12:07:52 -04:00
Andy Armstrong
85857e6729 Merge pull request #8831 from edx/andya/reenable-video-jasmine-tests
Re-enable the video translation Jasmine tests
2015-07-09 11:47:00 -04:00
Chris
e51a54a93b Merge pull request #8797 from edx/clrux/ux-2323-ora-focus
ORA2: Focus and outline styles
2015-07-09 11:44:22 -04:00
Ahsan Ulhaq
3cdad4677f Merge pull request #8776 from edx/ahsan/ECOM-1578-Credit-Payment-Dashboard-States-update
Credit Payment - Dashboard States
2015-07-09 20:17:48 +05:00
Usman Khalid
d2336ce767 Update edx-ora2 to release-2015-07-09T14.47. 2015-07-09 19:59:29 +05:00
Chris Rodriguez
5d086dab62 ORA2: Focus and outline styles 2015-07-09 19:59:28 +05:00
Andy Armstrong
e0b90f3f8d Merge pull request #8816 from mitocw/bdero/fix-paver-run-all
Fix the Paver run_all_servers method.
2015-07-09 10:33:43 -04:00
Sarina Canelake
5489e0381b Merge pull request #8842 from edx/sarina/upgrade-django
Upgrade Django 1.4 to the latest point release
2015-07-09 10:28:05 -04:00
Christine Lytwynec
c5293788e1 update bok choy to version 0.4.3 2015-07-09 10:14:13 -04:00
David Ormsbee
79de77cf95 Optimize grading/progress page to reduce database queries (cache max scores).
The progress page did a number of things that make performance terrible for
courses with large numbers of problems, particularly if those problems are
customresponse CapaModule problems that need to be executed via codejail.

The grading code takes pains to not instantiate student state and execute the
problem code. If a student has answered the question, the max score is stored
in StudentModule. However, if the student hasn't attempted the question yet, we
have to run the problem code just to call .max_score() on it. This is necessary
in grade() if the student has answered other problems in the assignment (so we
can know what to divide by). This is always necessary to know in
progress_summary() because we list out every problem there. Code execution can
be especially slow if the problems need to invoke codejail.

To address this, we create a MaxScoresCache that will cache the max raw score
possible for every problem. We select the cache keys so that it will
automatically become invalidated when a new version of the course is published.

The fundamental assumption here is that a problem cannot have two different
max score values for two unscored students. A problem *can* score two students
differently such that they have different max scores. So Carlos can have 2/3 on
a problem, while Lyla gets 3/4. But if neither Carlos nor Lyla has ever
interacted with the problem (i.e. they're just seeing it on their progress
page), they must both see 0/4 -- it cannot be the case that Carlos sees 0/3 and
Lyla sees 0/4.

We used to load all student state into two separate FieldDataCache instances,
after which we do a bunch of individual queries for scored items. Part of this
split-up was done because of locking problems, but I think we might have gotten
overzealous with our manual transaction hammer.

In this commit, we consolidate all state access in grade() and progress()
to use one shared FieldDataCache. We also use a filter so that we only pull
back StudentModule state for things that might possibly affect the grade --
items that either have scores or have children.

Because some older XModules do work in their __init__() methods (like Video),
instantiating them takes time, particularly on large courses. This commit also
changes the code that fetches the grading_context to filter out children that
can't possibly affect the grade.

Finally, we introduce a ScoresClient that also tries to fetch score
information all at once, instead of in separate queries. Technically, we are
fetching this information redundantly, but that's because the state and score
interfaces are being teased apart as we move forward. Still, this only
amounts to one extra SQL query, and has very little impact on performance
overall.

Much thanks to @adampalay -- his hackathon work in #7168 formed the basis of
this.

https://openedx.atlassian.net/browse/CSM-17
2015-07-09 10:03:58 -04:00
Andy Armstrong
14a9796cd4 Re-enable the video translation Jasmine tests
TNL-2689
2015-07-09 09:34:38 -04:00
Tasawer
c964b5cb5a Update copy for On Demand Cert Download
ECOM-1651
2015-07-09 15:45:40 +05:00
zubair-arbi
1e380815d9 Merge pull request #8846 from edx/zub/story/add-credit-provider-description
add 'provider_description' field for CreditProvider model
2015-07-09 14:20:16 +05:00
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States
ECOM-1578
2015-07-09 13:33:31 +05:00
zubair-arbi
71ce4d071b add 'provider_description' field for CreditProvider model
ECOM-1842
2015-07-09 13:13:37 +05:00
zubair-arbi
8a65167d79 Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model
add 'fulfillment_instructions' for 'CreditProvider' model
2015-07-09 12:04:53 +05:00
zubair-arbi
db82cbdeb7 Merge pull request #8817 from edx/zub/story/ecom-1648-update-credit-eligibility-ui-text
update credit eligibility ui text
2015-07-09 12:03:06 +05:00
Pan Luo
2b29ad2066 Fix failed test_course_about_in_cart
This test failed since d240785 on devstack.
The self.request_factory.get() just return a request object, which is
being passed to views.course_about() directly without being processed by
edxmako.middleware. The REQUEST_CONTEXT.request in
d240785b17/common/djangoapps/edxmako/middleware.py (L39)
is None, instead of request object, which contains the LANGUAGE_CODE and
other stuff used by the view.

Also cleaned up the use of MakoMiddleware. Using the method in
edxmako.tests module.
2015-07-08 23:46:51 -07:00
Clinton Blackburn
cd60dd5606 Merge pull request #8771 from edx/clintonb/currency-comparison-fix
Comparing currencies with same case
2015-07-09 01:45:39 -04:00
Alison Hodges
747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling
Ahodges/staff labeling
2015-07-08 17:34:29 -04:00
Sarina Canelake
9fcd8ffaae Upgrade Django 1.4 to the latest point release 2015-07-08 17:23:50 -04:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API"
This reverts commit c94abd2705.
2015-07-08 16:55:38 -04:00
Brandon DeRosier
783e83deb0 Revert "Add feature flag for Import/Export API in LMS"
This reverts commit 85b3bfe4f6.
2015-07-08 16:55:38 -04:00
Will Daly
e60ae31d84 Cherrypick hotfix-2015-07-07 into release candidate
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
2015-07-08 16:55:38 -04:00
Matt Drayer
b0c1e962c7 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-08 16:55:38 -04:00
Clinton Blackburn
b3437b7278 Corrected path to Commerce API
XCOM-312
2015-07-08 16:55:38 -04:00
Awais
db7dea118c ECOM-1829 Removing the regen link. 2015-07-08 16:55:37 -04:00
Will Daly
4b64df74b1 Fix migrations 0012 and 0013 in the credit app
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
2015-07-08 16:55:37 -04:00
Will Daly
1ee782cefa Merge pull request #8826 from edx/will/fix-progress-credit-typo
Fix a small typo for credit requirements on the progress page.
2015-07-08 13:40:14 -07:00
David Baumgold
146742ba07 Merge pull request #8828 from edx/db/remove-unused-gems
Remove unused Ruby gems
2015-07-08 16:18:25 -04:00
Will Daly
9056052b09 Fix a small typo for credit requirements on the progress page. 2015-07-08 11:56:43 -07:00
Mushtaq Ali
ab60b110af Merge pull request #8735 from edx/mushtaq/plat633-delete-case
Fix 'stuck in publish issue' when deleting a component
2015-07-08 23:07:46 +05:00
Braden MacDonald
d07a2798a1 Merge pull request #8815 from open-craft/hinted-login-fix
Fix hinted login view to be compatible with secondary providers.
2015-07-08 10:57:08 -07:00
Christopher Lee
ea36fcacea Merge pull request #8823 from edx/clee/add-better-email-message-in-release-script
Added more descripted release script message
2015-07-08 14:49:46 -03:00
David Baumgold
ccd602343f Remove unused Ruby gems
These were only used by rake, and we haven't used rake in a year.
2015-07-08 13:27:06 -04:00
Ben McMorran
9e5290c1a7 Merge pull request #8822 from edx/benmcmorran/taiwan-fix
TNL-2665 Prevent Taiwan from being translated
2015-07-08 13:26:17 -04:00
Kyle McCormick
afa77db944 Merge pull request #8642 from edx/mekkz/course-overviews-dashboard
Update LMS student dashboard to use CourseOverview
2015-07-08 13:06:36 -04:00
Jesse Zoldak
7b33b73a8c Merge pull request #8824 from edx/zoldak/TNL-1475
Disable flaky GroupConfigurationsPage JS test TNL-1475
2015-07-08 12:43:29 -04:00
Ben Patterson
25434a03e0 Merge pull request #8827 from edx/revert-8818-tasawer/story/ecom-1651-on-demand-cert-download
Revert "Update copy for On Demand Cert Download"
2015-07-08 12:34:57 -04:00
christopher lee
080450d5b2 Added more descripted release script message 2015-07-08 12:19:10 -04:00