Commit Graph

11471 Commits

Author SHA1 Message Date
Jesse Zoldak
98a8f0e282 Merge pull request #8917 from edx/zoldak/SOL-1053
Mark delete certificates test as flaky SOL-1053
2015-07-14 11:47:30 -04:00
Feanil Patel
ea5b41cd84 Merge pull request #8898 from edx/feanil/fix_student_migrations
Update migration dependency.
2015-07-14 10:27:56 -04:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup
LMS User menu cleanup
2015-07-14 09:23:36 -04:00
Jesse Zoldak
96b2baba63 Mark delete certificates test as flaky SOL-1053 2015-07-14 09:10:34 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes
Styling improvements to openedX search through Find Courses page
2015-07-14 08:14:35 -04:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021
ziafazal/SOL-1021: Create Analytics events for certificate actions
2015-07-14 07:58:55 -04:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
2015-07-14 11:12:09 +05:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Andy Armstrong
b604d647f8 Fix indentation 2015-07-13 17:58:16 -04:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations
Skipped 'print' statement violations, as print() is Py3k syntax.
2015-07-13 17:33:28 -04:00
Sarina Canelake
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Feanil Patel
4ae4e25f5c Update student migration 0035 to add a dependency.
This migration instantiates the modulestore which is now dependent
the xblock_django database config settings.  So the initial migration
for that has to run before this migration.
2015-07-13 16:53:33 -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
asadiqbal
19d6012033 bokchoy update 2015-07-13 15:57:50 +05:00
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types
TNL-2619
2015-07-13 12:18:25 +05:00
jsa
41b0b793de reduce log severity when building marketing links 2015-07-10 16:21:12 -04:00
Frances Botsford
c35ebb7658 pr feedback 2015-07-10 14:13:45 -04:00
Frances Botsford
32df8db753 user menu cleanup 2015-07-10 14:13:45 -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
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
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
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
Jesse Zoldak
b17ac38a7b Mark test as flaky TNL-2704 2015-07-09 10:50:44 -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
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States
ECOM-1578
2015-07-09 13:33:31 +05: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
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
Jesse Zoldak
be5ae551b2 Mark a too-flaky Milestones acceptance test for skipping 2015-07-08 14:41:58 -04: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
Kyle McCormick
1dfe9ed9e8 MA-779 Update student dashboard to use CourseOverview 2015-07-08 12:05:38 -04:00
Kyle McCormick
5b630a7704 MA-779 Make has_access work on CourseOverview objects 2015-07-08 12:05:38 -04:00
Awais Jibran
989091d1ed TNL-2165
"play_video" event emitted after seeking forward in a video contains old position
2015-07-08 12:20:59 +05:00
Awais Jibran
ef89c662f3 Merge pull request #8742 from edx/aj/tnl2551-randomized-problems-failing
[NEW] - Fixed randomized problems which were not appearing to work.
2015-07-08 11:49:23 +05:00
Matt Drayer
c25e37ea93 Merge pull request #8734 from edx/ziafazal/SOL-1011
ziafazal:SOL-1011: Certificate URL should use 'download_url' field and not 'verify_uuid'
2015-07-07 15:40:34 -04:00
Will Daly
104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py
2015-07-07 09:58:45 -07:00
mushtaqali
2ca9d4d070 Fix 'stuck in publish issue' when deleting an item after dicarding the changes 2015-07-07 21:52:39 +05:00
Christine Lytwynec
7af1a44d73 Merge pull request #8792 from edx/clytwynec/flaky-test
flag test as flaky
2015-07-07 10:08:25 -04:00
Clinton Blackburn
301a874c5c Enforcing lowercase currency for CourseMode
- CourseMode.save() always lowercases the currency value
- CourseMode currency comparisons have been updated to be case-insensitive
2015-07-06 23:38:25 -04:00
Ahsan Ulhaq
796e4cb5e6 Merge pull request #8580 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API-update
LMS: Modification in enrollment API
2015-07-07 02:32:53 +05:00