Commit Graph

41104 Commits

Author SHA1 Message Date
Calen Pennington
c9f6872be3 Capture the language preference set by an anonymous user when the register or login
[LEARNER-168]
2017-05-15 07:36:56 -04:00
Nimisha Asthagiri
956207b932 Merge pull request #15081 from edx/neem/bulk-read-grade-report
Grade Report: Fix column alignment issue when Teams is disabled
2017-05-10 10:19:52 -04:00
Douglas Hall
ec45278b05 Merge pull request #15073 from edx/douglashall/activation_email_followup
Remove edx.org theme override of activation email body.
2017-05-09 20:58:58 -04:00
Nimisha Asthagiri
e97283ae44 Fix column alignment issue when Teams is disabled 2017-05-09 19:44:34 -04:00
Renzo Lucioni
750d448799 Avoid passing a generator expression to cache.get_many()
Generator expressions passed to the memcached backend's implementation of get_many() are exhausted prematurely. This results in KeyErrors when the backend tries to map keys returned by memcached back to keys passed by application code.

See https://github.com/django/django/blob/stable/1.8.x/django/core/cache/backends/memcached.py/#L99.

LEARNER-382
2017-05-09 18:24:39 -04:00
Matthew Piatetsky
5cf828a728 Merge pull request #15077 from edx/LEARNER-886
LEARNER-886 Fix check for image url on program detail page
2017-05-09 17:31:57 -04:00
Matthew Piatetsky
21c24eb99e Fix check for image url on program detail page
LEARNER-886
2017-05-09 16:02:56 -04:00
Douglas Hall
0a313da601 Remove edx.org theme override of activation email body.
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
2017-05-09 15:46:10 -04:00
Matt Drayer
524e2f3e24 Merge pull request #15071 from edx/mattdrayer/edx-enterprise-0.33.13
mattdrayer/edx-enterprise-0.33.13: Update package reference
2017-05-09 15:26:25 -04:00
Robert Raposa
698475f5d3 Merge pull request #15070 from edx/robrap/revert-waffle-hack
Revert: Default unified_course_view on in devstack.
2017-05-09 14:23:18 -04:00
Matt Drayer
534590143d mattdrayer/edx-enterprise-0.33.13: Update package reference 2017-05-09 11:22:18 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report
Bulk-reads and Request caching in Course Grade Report
2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
9df23dc23e Merge pull request #15066 from edx/neem/fix-block-structure-key-error
Fix KeyError issue with empty course structures
2017-05-09 10:39:53 -04:00
Robert Raposa
59522311ef Revert: Default unified_course_view on in devstack. 2017-05-09 10:08:58 -04:00
Matt Drayer
cd56cc56cd Merge pull request #15030 from edx/mattdrayer/ENT-318
ENT-318: Update activation email subject and message text
2017-05-09 09:29:13 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Nimisha Asthagiri
8c01ffb71a Fix KeyError issue with empty course structures.
EDUCATOR-340
2017-05-09 08:44:09 -04:00
Renzo Lucioni
3aba9da8fa Support reading of programs exclusively from the cache
When enabled, these changes prevent LMS application code from hitting the discovery service in-process to retrieve programs. Instead, program data is pulled from cache entries populated by a management command, cache_programs.

LEARNER-382
2017-05-08 18:43:25 -04:00
Robert Raposa
ed5412eba9 Merge pull request #15059 from edx/robrap/LEARNER-868
LEARNER-868: Default unified_course_view on in devstack.
2017-05-08 14:23:14 -04:00
Cliff Dyer
65352c9d6c Merge pull request #15060 from edx/neem/handle-iter-errors
Neem/handle iter errors
2017-05-08 14:11:36 -04:00
Diana Huang
8231d2d05f Merge pull request #15058 from edx/diana/course-date-info-fix
Only try to render dates when user is authenticated.
2017-05-08 13:11:52 -04:00
Diana Huang
c0b7f9b82d Only try to render dates when user is authenticated. 2017-05-08 12:24:24 -04:00
J. Cliff Dyer
5beae9d1e8 Raise error at first encounter during compute_grades_for_course(_v2) task 2017-05-08 12:18:32 -04:00
J. Cliff Dyer
cebdbc18e7 Update CourseGradeFactory().iter() to return exception objects 2017-05-08 12:16:52 -04:00
Robert Raposa
e185d886d4 Default unified_course_view on in devstack. 2017-05-08 11:45:24 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Matthew Piatetsky
15b111410a Merge pull request #15053 from edx/minor_tweaks2
ECOM-6602 Change buy certificate button style
2017-05-05 18:03:43 -04:00
Matthew Piatetsky
7215a86539 Change buy certificate button style
ECOM-6602
2017-05-05 16:45:16 -04:00
Andy Armstrong
6d4f499b1b Merge pull request #15050 from edx/andya/fix-query-count-test
Fix broken Python certificate tests
2017-05-05 16:08:21 -04:00
Andy Armstrong
480cf57026 Improve test failure message 2017-05-05 15:12:21 -04:00
Brandon DeRosier
3d51bd0817 Merge pull request #15022 from open-craft/bdero/ent-361
ENT-361: Allow hiding of IDP selection page during SSO
2017-05-05 15:10:35 -04:00
Andy Armstrong
a12f7ae578 Merge pull request #15021 from edx/andya/enable-course-sidebar
Enable course sidebar for new course home page
2017-05-05 14:49:16 -04:00
Renzo Lucioni
08dcbace0f Cache program UUIDs after caching details
This prevents the LMS from requesting details for programs which the command hasn't been able to cache yet, which would throw off monitoring we'll be setting up to keep an eye on missing entries.

LEARNER-382
2017-05-05 14:45:47 -04:00
Andy Armstrong
9ce46a3fb5 Improve course experience tests 2017-05-05 13:55:59 -04:00
Andy Armstrong
75a0fdf0eb Enable course sidebar for new course home page
LEARNER-764
2017-05-05 13:55:59 -04:00
M. Rehan
37eba6ace4 Merge pull request #15048 from edx/mzfr/overview-fix-edu/218
Re-create image set for course overview.
2017-05-05 20:51:55 +05:00
Qubad786
a01e5771e3 Repopulate course overview imageset 2017-05-05 19:24:58 +05:00
muzaffaryousaf
4fa993ac37 Re-create image set for course overview.
EDU-218
2017-05-05 19:17:40 +05:00
Noraiz Anwar
3c0e02067d Merge pull request #14954 from edx/noraiz/TNL-6870
TNL-6870 Add masquerading feature for preview mode
2017-05-05 18:58:47 +05:00
Andy Armstrong
45d7577268 Merge pull request #14994 from edx/diana/course-dates-fragment
Add course dates fragment to new sidebar
2017-05-05 07:40:52 -04:00
Diana Huang
e12a704cea Add new course dates fragment.
Also add it to the course home page.
2017-05-04 20:53:42 -04:00
Andy Armstrong
b3c38454be Merge pull request #15029 from edx/marco/course-outline/visual-updates
LEARNER-821 -Visual adjustments to course outline
2017-05-04 18:04:57 -04:00
Andy Armstrong
97c084514f Merge pull request #15044 from edx/bjacobel/mako-bundle-nonfatal
Mako should be able to render even if webpack hasn't run
2017-05-04 17:55:40 -04:00
Andy Armstrong
70f4bcc619 Merge pull request #15040 from edx/andya/feature-test-coverage
Make tests and coverage work with openedx/features
2017-05-04 17:52:12 -04:00
Renzo Lucioni
7fc356b537 Merge pull request #15035 from edx/renzo/improved-program-caching
Add management command for caching program data
2017-05-04 17:34:41 -04:00
marcotuts
01ae718117 visual adjustments to course outline 2017-05-04 17:05:57 -04:00
Robert Raposa
1262bf74e5 Skip test. 2017-05-04 16:56:09 -04:00
Renzo Lucioni
6cf2503f0b Add management command for caching program data
This command requests every available program from the discovery service, writing each to its own cache entry with an indefinite expiration. It is meant to be run on a scheduled basis and should be the only code updating these cache entries.

LEARNER-382
2017-05-04 15:35:26 -04:00
Robert Raposa
86637d7f6c Various test fixes. 2017-05-04 15:21:27 -04:00
Muzaffar yousaf
49f20a323b Merge pull request #15042 from edx/mrehan/courseoverview-broader-for-prod-clone
EDUCATOR-218 – Add logging
2017-05-04 23:27:59 +05:00