Commit Graph

7866 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
c1e2d39b38 Merge pull request #14444 from edx/aj/TNL-6381_upsell_msg
Aj/tnl 6381 upsell msg
2017-02-10 07:25:23 -05:00
Albert St. Aubin
97d7633774 Added upgrade upsell to course info banner and url parameter
TNL-6381
2017-02-09 20:21:39 -05:00
Jesse Shapiro
424b4356a5 Merge pull request #14400 from open-craft/haikuginger/enterprise-course-consent
[ENT-101] Add course-specific data sharing consent hooks for Enterprise app
2017-02-09 18:37:55 -05:00
Renzo Lucioni
dda0e03f65 Merge pull request #14488 from edx/renzo/finish-catalog-transition
Finish transition to catalog for program data
2017-02-09 16:10:44 -05:00
Renzo Lucioni
0e06e90599 Finish transition to catalog for program data
Updates Mako and Underscore templates as well as Backbone models and views so they work with catalog programs. Removes all remaining response munging from the back end.

ECOM-4422
2017-02-09 14:51:26 -05:00
Jesse Shapiro
9a573de533 Add consent check to course access prerequisites; add utility functions to provide interface to course-specific consent in Enterprise app 2017-02-09 13:49:57 -05:00
Nimisha Asthagiri
31ec562168 Merge pull request #14490 from edx/beryl/request-cache-feature-flag
request-cache grades feature flag to avoid 400+ memcached hits
2017-02-08 11:41:55 -05:00
Nimisha Asthagiri
2026a518d5 Merge pull request #14489 from edx/beryl/new-relic
Add new relic parameters to grades task
2017-02-08 11:41:30 -05:00
Nimisha Asthagiri
f2abce53cb request-cache grades feature flag to avoid 400+ memcached hits 2017-02-08 10:01:52 -05:00
sanfordstudent
37c266f08f Merge pull request #14423 from edx/sstudent/TNL-6219
add course and user id to library content assigned
2017-02-08 09:47:59 -05:00
Nimisha Asthagiri
697b3d7d98 Add new relic parameters to grades task 2017-02-07 19:29:17 -05:00
Sanford Student
1a5e15fd5c add course and user id to library content assigned 2017-02-07 13:52:15 -05:00
Renzo Lucioni
9be3191829 Merge pull request #14462 from edx/renzo/programs-from-catalog
Load all programs from the catalog
2017-02-07 10:42:17 -05:00
Renzo Lucioni
e7771148b7 Load all programs from the catalog
This commit contains back end changes necessary to load programs from the catalog in all contexts. The existing program munging utility is applied as late as possible to avoid conflating this work with changes to the front end; those will be made separately.

ECOM-4422
2017-02-06 23:16:29 -05:00
Douglas Hall
06fa13f4df Allow for customization of course email template at the organization level 2017-02-06 14:23:58 -05:00
Nimisha Asthagiri
9436edf856 Merge pull request #14446 from edx/beryl/grades-mongo-query
Fix mongo query count for Grades API
2017-02-02 11:13:06 -05:00
Nimisha Asthagiri
7cc08399c6 Fix mongo query count for Grades API 2017-02-01 17:58:36 -05:00
Nimisha Asthagiri
1912176c5a Merge pull request #14438 from edx/beryl/cohort_integrity_error
Fix cohort IntegrityErrors
2017-02-01 15:35:21 -05:00
Jesse Zoldak
b0647e7d83 Revert "Fix mongo query count for Grades API" 2017-02-01 11:09:43 -05:00
Nimisha Asthagiri
0f89af8af1 Merge pull request #14439 from edx/beryl/grades-mongo-query
Fix mongo query count for Grades API
2017-02-01 10:27:43 -05:00
Nimisha Asthagiri
704a16ad3f Fix mongo query count for Grades API 2017-02-01 09:32:27 -05:00
Clinton Blackburn
7c39978b06 Automated refund approval process
Refunds are now processed automatically. If the automated processing fails, the system falls back to the previous behavior of notifying the Support Team. Additionally, these calls are all made by the service user rather than the learner.

ECOM-6541
2017-02-01 01:51:21 -05:00
Clinton Blackburn
1189867dd2 Removed references to ECOMMERCE_API_SIGNING_KEY
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
2017-02-01 01:51:21 -05:00
Nimisha Asthagiri
95b4cbbcf8 Fix cohort Integrity Errors
TNL-5725
2017-01-31 22:56:56 -05:00
Eric Fischer
6f8383199f Allow null edited_timestamp
Some old mongo courses do not have this field, and the team has opted
to allow null values rather than inserting a default. This change
affects both course and subsection grades.

TNL-6408
2017-01-30 13:19:36 -05:00
Eric Fischer
a78db97d26 Delay grades recalculation task
As discovered in load testing, if this task is run too quickly it
can ask for a newly-recorded score prior to the active transaction
finishing and writing to the database.

TNL-6424
2017-01-30 13:19:36 -05:00
alisan617
69d002a1bf Merge pull request #14413 from edx/alisan/discussion-a11y-TNL-6363
discussion all topics button in breadcrumbs markup change
2017-01-27 14:52:46 -05:00
alisan617
ac93935486 discussion all topics in breadcrumbs moved away from h6 2017-01-27 13:45:20 -05:00
Renzo Lucioni
136e7f9b16 Remove program certification view from the support app
This functionality hasn't been used since it was introduced. It is superseded by the backpopulate_program_credentials management command. This is another commit in a series removing use of the old programs service from edx-platform.

ECOM-4422
2017-01-27 13:14:45 -05:00
David Ormsbee
41ea1383d4 Merge pull request #14399 from edx/ormsbee/csm_crawler_locking
Disable student state writes for crawlers.
2017-01-27 12:28:11 -05:00
Clinton Blackburn
5ff02315cc Merge pull request #14397 from edx/clintonb/update-edx-drf-extensions
Updated edx-rest-api-client to 1.7.1
2017-01-26 16:24:30 -05:00
Dennis Jen
a107754ff4 Merge pull request #14386 from edx/dsjen/tracking
Added user tracking id to profile scope in oauth2 handler.
2017-01-26 15:20:42 -05:00
Clinton Blackburn
aec759fd65 Updated edx-rest-api-client to 1.7.1
https://github.com/edx/edx-rest-api-client/compare/1.6.0...1.7.1

ECOM-6634
2017-01-26 15:13:01 -05:00
David Ormsbee
608fceb0b5 Remove select_for_update option for FieldDataCache
We've already been ignoring the param for a long time. This just
removes it entirely.
2017-01-26 12:51:22 -05:00
sanfordstudent
09c021e7ee Merge pull request #14370 from edx/sstudent/grades-tasks-logging
add task id to logging and log database exceptions for TNL-6332
2017-01-26 10:44:09 -05:00
Sanford Student
dd93496f7a add task id to logging and log database exceptions
for TNL-6332, TNL-6373
2017-01-26 10:06:34 -05:00
Dennis Jen
080f2b90db Added tracking claim to profile scope in oauth handler. 2017-01-26 09:49:47 -05:00
David Ormsbee
5ef1e08050 Disable student state writes for crawlers.
When crawlers like edX-downloader make requests on courseware, they are
often concurrently loading many units in the same sequence. This causes
contention for the rows in courseware_studentmodule that store the
student's state for various XBlocks/XModules, most notably for the
sequence, chapter, and course -- all of which record and update user
position information when loaded.

It would be nice if we could actually remove these writes altogether
and come up with a cleaner way of keeping track of the user's position.
In general, GETs should be side-effect free. However, any such change
would break backwards compatibility, and would require close
coordination with research teams to make sure they weren't negatively
affected.

This commit identifies crawlers by user agent (CrawlersConfig model),
and blocks student state writes if a crawler is detected. FieldDataCache
writes simply become no-ops. It doesn't actually alter the rendering
of the courseware in any way -- the main impact is that the blocks
won't record your most recent position, which is meaningless for
crawlers anyway.

This can also be used as a building block for other policy we want to
define around crawlers. We just have to be mindful that this only works
with "nice" crawlers who are honest in their user agents, and that
significantly more sophisticated (and costly) measures would be
necessary to prevent crawlers that try to be even trivially sneaky.

[PERF-403]
2017-01-26 09:36:53 -05:00
J. Cliff Dyer
df7c2715d3 Create infrastructure for reapplying tasks
and cleaning up tasks that have been resolved.

TNL-6252
2017-01-25 16:22:40 -05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
Nimisha Asthagiri
784ef04221 Merge pull request #14359 from edx/beryl/command_generate_cb_tasks
Update generate_course_blocks management command to enqueue tasks.
2017-01-24 17:24:30 -05:00
Nimisha Asthagiri
c04f4401dc Update generate_course_blocks management command to enqueue tasks 2017-01-24 09:11:57 -05:00
Nimisha Asthagiri
59532fb9a2 Merge pull request #14360 from edx/beryl/fix_db_updated_check
Update has_database_updated_with_new_score to handle all block types
2017-01-23 20:24:43 -05:00
Christopher Lee
b287f48f8b Merge pull request #14301 from edx/clee/return-all-courses-on-mobile
MA-3091: Return non-mobile courses from the mobile enrollments API
2017-01-23 15:55:08 -05:00
Nimisha Asthagiri
5a9179bf00 Update has_database_updated_with_new_score to handle all block types
TNL-6331
2017-01-23 15:50:16 -05:00
christopher lee
b5e987ba61 MA-3091: Added mobile_available flag override admin setting 2017-01-23 15:04:40 -05:00
Renzo Lucioni
3fd23629a3 Transition program list and detail pages to the catalog
Uses a Waffle Switch to route traffic between the programs and catalog services. A future commit will remove use of the switch and use the catalog exclusively.

ECOM-4422
2017-01-23 11:29:38 -05:00
Renzo Lucioni
acef28c70c Merge pull request #14259 from edx/ECOM-6535
ECOM-6535 Change celery task to only pull from catalog and not programs api
2017-01-20 15:55:57 -05:00
Matthew Piatetsky
05b461824e Pull programs from catalog when issuing program credentials
Lays the groundwork for pulling all program data from the catalog.

ECOM-6535
2017-01-20 14:48:43 -05:00
alisan617
bcaeaffa7b Merge pull request #14338 from edx/alisan/inline-discussion-sort-TNL-6117
Inline discussion sorting TNL-6117
2017-01-20 10:48:35 -05:00