Commit Graph

31469 Commits

Author SHA1 Message Date
Adam Palay
24cd124195 add data_dir to bok_choy test settings 2015-07-13 17:10:32 -04:00
Adam Palay
2c6264077d address quality violation 2015-07-13 15:09:53 -04:00
Adam Palay
5088ae3091 when removing field from _field_data_cache when rebinding a module to a new user, also remove it from _dirty_fields (TNL-2640) 2015-07-13 14:17:27 -04:00
Adam Palay
213dc70d1e update to course import (TNL-2270) 2015-07-13 14:17:26 -04:00
Matt Drayer
37a0c19ada Merge pull request #8777 from edx/asadiqbal08/SOL-767_twitter_sharing
asadiqbal08/SOL-767: Students can share their certificate view on Twitter
2015-07-13 10:10:13 -04:00
Jim Abramson
eed3ecad7f Merge pull request #8861 from edx/jsa/stop-warning-noise
reduce log severity when building marketing links
2015-07-13 08:56:28 -04:00
Sarina Canelake
0b3631b5be Merge pull request #8885 from edx/sarina/20150710-update-translations
Update translations (autogenerated message)
2015-07-13 08:18:55 -04:00
Muhammad Ammar
798aa02f63 Merge pull request #8751 from edx/ammar/tnl2619
Visual change to new Hints and Feedback problem types
2015-07-13 17:03:52 +05:00
asadiqbal
19d6012033 bokchoy update 2015-07-13 15:57:50 +05:00
asadiqbal
68ee36e84e update the code as per suggestions 2015-07-13 13:54:01 +05:00
asadiqbal
1782f72555 Students can share their certificate view on Twitter 2015-07-13 12:40:45 +05:00
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types
TNL-2619
2015-07-13 12:18:25 +05:00
Sarina Canelake
1a46556a03 Update translations (autogenerated message) 2015-07-13 00:50:28 -04:00
Renzo Lucioni
4facd069a5 Merge pull request #8886 from edx/renzo/basket-creation-authentication
Commerce baskets API supports cross-domain session and OAuth2 authentication
2015-07-10 20:06:38 -04:00
jsa
41b0b793de reduce log severity when building marketing links 2015-07-10 16:21:12 -04:00
Renzo Lucioni
3db2b5ff88 Commerce baskets API supports cross-domain session and OAuth2 authentication
Required in order to support requests from Drupal and mobile clients. XCOM-493.
2015-07-10 15:42:49 -04:00
Christine Lytwynec
bc78baa091 Merge pull request #8841 from edx/clytwynec/TE-745
Fix for TE-745
2015-07-10 09:08:52 -04:00
Renzo Lucioni
77e0c049b8 Merge pull request #8836 from edx/renzo/edx-oauth2-provider-upgrade
Update edx-oauth2-provider to 0.5.2
2015-07-09 18:23:10 -04:00
Clinton Blackburn
b87c525109 Merge pull request #8866 from edx/clintonb/commerce-api-expiration-date
Updated Commerce API to return CourseMode expiration date
2015-07-09 17:00:03 -04:00
Tyler Nickerson
0220baac59 Merge pull request #8868 from edx/nickersoft/update-authors
Update AUTHORS
2015-07-09 16:50:39 -04:00
Tyler Nickerson
d0affa1342 Update AUTHORS 2015-07-09 16:46:00 -04:00
Tyler Nickerson
825d99deee Merge pull request #8865 from edx/nickersoft/jwt-security
XCOM-281: LMS now passes JWT issuer and expiration date to ecommerce API client
2015-07-09 16:43:07 -04:00
Clinton Blackburn
7d91361f32 Updated Commerce API to return CourseMode expiration date
XCOM-477
2015-07-09 15:30:48 -04:00
Jesse Zoldak
2b51029db3 Merge pull request #8834 from edx/zoldak/SOL-449
Mark a too-flaky Milestones acceptance test for skipping
2015-07-09 15:12:32 -04:00
Christine Lytwynec
14fdc836c5 Fix for TE-745 2015-07-09 15:09:16 -04:00
Jesse Zoldak
de97e31a25 Merge pull request #8858 from edx/zoldak/TNL-2704
Mark test as flaky TNL-2704
2015-07-09 15:09:07 -04:00
Nickersoft
2d13e9e886 LMS now passes JWT issuer and expiration date to ecommerce API client 2015-07-09 15:06:54 -04:00
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
Jesse Zoldak
b17ac38a7b Mark test as flaky TNL-2704 2015-07-09 10:50:44 -04: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