Commit Graph

3531 Commits

Author SHA1 Message Date
Diana Huang
2ac1590df4 Merge pull request #9276 from edx/diana/update-status-message
Make status use ConfigurationModel instead.
2015-08-13 16:37:23 -04:00
cahrens
bb910ca632 Add toggle_login_modal to list of base_application_js.
TNL-3051
2015-08-13 11:28:51 -04:00
Bill DeRusha
716c1f74cf Merge pull request #9237 from edx/bderusha/teams-expand-users-api-fix
Team API include correct info when expanding users
2015-08-12 15:27:48 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
2015-08-12 14:33:07 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
2015-08-12 07:09:46 -07:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
2015-08-11 15:44:37 -04:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex.
PLAT-776
2015-08-11 13:36:07 +05:00
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https
Deactivate HTTPS on devstack
2015-08-10 17:29:05 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
2015-08-10 10:29:45 -04:00
Carson Gee
cb678b9c35 Merge pull request #8979 from mitocw/feature/cg/lti_provider_config
Additional configuration options for LTI provider feature.
2015-08-09 09:10:14 -04:00
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -04:00
cahrens
fd31c68404 Include coffee dependency files in discussion_js. 2015-08-07 09:14:11 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled.
Improve client-side performance.
2015-08-07 09:14:11 -04:00
cahrens
68645db38b Reduce dependency on courseware_js.
TNL-2945
2015-08-07 09:14:06 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Sarina Canelake
db2d8f6594 Allow microsites to use logistration page (ECOM-1976) 2015-07-31 09:33:59 -04:00
Albert Liang
46434582c8 Deactivate HTTPS on dev and devstack
When running locally, XBlocks which access third-party software no longer
cause server errors.

Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'.
This meant that XBlocks attempted to use SSL when dealing with third-party
components like LTI.  Since SSL is not enabled on devstack, this caused server
errors whenever these features ran.
2015-07-30 13:22:33 -07:00
jsa
ba239125f1 disable course discovery feature by default in devstack. 2015-07-29 17:40:57 -04:00
Will Daly
47b81c9274 Allow users to submit initial verification at in-course checkpoints.
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
  for the photo ID image of reverification attempts.
2015-07-27 19:32:18 -07:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration .
TNL-2413
2015-07-24 17:03:46 +05:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio
Integrate timed and proctored exam authoring into Studio
2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email
ECOM-1796
ECOM-1525
2015-07-22 12:34:38 +05:00
cahrens
ad16f9f968 Optimize search usages. 2015-07-20 14:24:30 -04:00
Peter Fogg
1ceb8a0d66 Optimize finish_auth_factory.
TNL-2602
2015-07-20 13:59:55 -04:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS
TNL-2487
2015-07-20 13:59:54 -04:00
Carson Gee
5cebad26e9 Additional configuration options for LTI provider feature. 2015-07-20 10:37:24 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required
Decorated instructor dashboard with sudo_required.
2015-07-16 21:12:43 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api.
ECOM-1858
2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Clinton Blackburn
6088bc3401 Pulling JWT settings from envs tokens
XCOM-281
2015-07-15 16:06:17 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
zubair-arbi
10bfcb83a0 add url link for credit checkout page
ECOM-1524
2015-07-15 00:31:15 +05:00
Peter Fogg
7bc333d8c5 Remove duplicated Teams app setting. 2015-07-13 15:49:24 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00
asadiqbal
1782f72555 Students can share their certificate view on Twitter 2015-07-13 12:40:45 +05:00
Nickersoft
2d13e9e886 LMS now passes JWT issuer and expiration date to ecommerce API client 2015-07-09 15:06:54 -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
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
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
Matt Drayer
b0c1e962c7 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-08 16:55:38 -04:00
Ben McMorran
6bd5eec18d TNL-2665 Prevent Taiwan from being translated 2015-07-08 14:12:56 +00:00
Aamir
9f0b5ed2cd Merge pull request #8720 from edx/ECOM-1601-credit-help-link
ECOM-1601: Added the help link of credit info
2015-07-08 11:55:11 +05:00
chrisndodge
8cde240dd8 Merge pull request #8805 from edx/cdodge/remove-profile-panel
Remove the DjDT profiling panel from devstack.py. It appears to cause…
2015-07-07 22:38:15 -04: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