Commit Graph

12500 Commits

Author SHA1 Message Date
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
raeeschachar
0e88264df6 Merge pull request #11111 from edx/raees/chrome-bokchoy-test-url-routing
Fixed test url routing failing on Chrome
2016-01-05 00:10:38 +05:00
Bill DeRusha
77d85614b3 Merge pull request #11058 from edx/bderusha/mailchimp-activate
Mailchimp activation
2016-01-04 13:53:13 -05:00
Bill DeRusha
39b5eccf67 Update isActive column in mailchimp upon activation 2016-01-04 13:00:31 -05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529
SOL-1529: Allow PMs to Invalidate Certificates
2016-01-04 10:46:27 -05:00
Ben Patterson
99b029969c Merge pull request #11097 from edx/ziafazal/SOL-1560
ziafazal/SOL-1560:load db_fixures when run with --testsonly
2016-01-04 09:00:38 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test
Shr/bug/tnl 2622 course import status message fix test
2016-01-04 12:33:45 +05:00
raeeschachar
4694b0a6f9 Fixed test url routing failing on Chrome 2016-01-01 18:35:15 +05:00
Ben Patterson
1ece96a5a8 Merge pull request #11103 from edx/benp/refresh-lettuce-db-cache
Update lettuce db cache with the latest migrations.
2015-12-31 10:30:01 -05:00
Zia Fazal
2f275f31b4 fixed scenario when tests run using cached sql schema 2015-12-31 20:03:28 +05:00
Zia Fazal
7cdeb3300a load db_fixures when run with --testsonly
revert shell script change
2015-12-31 15:39:08 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +05:00
clrux
622413a8e5 Merge pull request #11050 from edx/clrux/ac-296
LMS: re-enable Enter and Space to toggle transcript
2015-12-30 14:43:05 -05:00
Ben Patterson
7d76db555e Update lettuce db cache with the latest migrations. 2015-12-30 13:37:42 -05:00
Syed Hasan raza
a5f7f502f2 Merge pull request #11093 from edx/shr/bug/AN-4509-detail-logging
Detail logging for backend_logger
2015-12-30 22:23:37 +05:00
David Ormsbee
dba12c09a3 Merge pull request #11088 from edx/ormsbee/seq_new_relic_tagging
Add New Relic instrumentation to SequenceModule.
2015-12-30 08:51:08 -05:00
Syed Hassan Raza
a16791baaa Detail logging for backend_logger 2015-12-30 15:41:01 +05:00
Awais Jibran
4f185abc33 Merge pull request #10749 from edx/aj/tnl3779-use-get-courses-summaries-for-staff
Render CMS course listing Using CourseSummary class for staff
2015-12-30 11:49:55 +05:00
David Ormsbee
0219071502 Add New Relic instrumentation to SequenceModule.
The goal of this is to capture more detailed usage and performance
information around the kind of course content we have out there.
Having this information will allow us to more easily query to see
how sequence size and specific block types affect front end
performance.
2015-12-29 19:08:30 -05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
asadiqbal
624b2ba406 SOL-1358 2015-12-29 16:40:27 +05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field
Update Course Catalog API to support About Overview field
2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Peter Fogg
d9b181e83f Merge pull request #11053 from edx/peter-fogg/enrollment-api-slashes
Add optional trailing slashes to the Enrollment API.
2015-12-28 10:29:40 -05:00
raeeschachar
e5cbb1c92e Fixed test cannot upload json translation failing on Chrome 2015-12-23 18:15:09 +05:00
Peter Fogg
3149aaa319 Add options trailing slashes to the Enrollment API.
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
2015-12-22 14:52:27 -05:00
Robert Raposa
f5a63b1e36 Merge pull request #10962 from edx/robrap/TNL-3425
Deprecate escaping in display_name_with_default
2015-12-22 14:49:32 -05:00
raeeschachar
62597a17fd Merge pull request #11036 from edx/raees/chrome-bokchoy-test-cohort-by-csv-unicode
Fixed test cohort by csv unicode failing on Chrome
2015-12-22 22:36:55 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Ben Patterson
82ca667db4 Merge pull request #11044 from edx/revert-10994-mushtaq/improve_get_item
Revert "Append block item only if it has path to root"
2015-12-22 10:13:26 -05:00
Chris Rodriguez
ac9d866fab LMS: re-adding Enter and Space toggle for transcript control 2015-12-22 09:59:54 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
raeeschachar
05b96f8c93 Merge pull request #11038 from edx/raees/chrome-bokchoy-test-search-flaky
Fixed test search flaky on Firefox and Chrome
2015-12-22 12:35:35 +05:00
Ben Patterson
92f4d41fac Revert "Append block item only if it has path to root" 2015-12-21 14:33:32 -05:00
Ben Patterson
e6a5ef811e Merge pull request #11039 from edx/benp/skip-flaky-test-TNL-3943
Skip test; it has become too flaky to be reliable.
2015-12-21 12:54:18 -05:00
Ibrahim Ahmed
5832b579be Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment
Ibrahimahmed443/sol 1479 change time allotment
2015-12-21 21:55:30 +05:00
Ben Patterson
ff681348b5 Skip test; it has become too flaky to be reliable. 2015-12-21 11:43:35 -05:00
Ben Patterson
42de6ffa96 Merge pull request #11033 from edx/benp/better-troubleshooting
bok-choy: Additional detail to assist troubleshooting CourseFixture errors
2015-12-21 11:35:16 -05:00
raeeschachar
289a1df62d Fixed test cohort by csv unicode failing on Chrome 2015-12-21 20:35:44 +05:00
Ben Patterson
4ea93f778b Merge pull request #11034 from edx/benp/mark-flaky
Mark test as flaky. See TNL-3943.
2015-12-21 10:34:21 -05:00
Matt Drayer
17d1f9be0c Merge pull request #11037 from edx/ziafazal/SOL-1496
SOL-1496: added a slug field to reference template asset using this field
2015-12-21 10:31:39 -05:00
ibrahimahmed443
f3d43ab5db SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit 2015-12-21 19:30:49 +05:00
raeeschachar
0f3faacfca Fixed test search flaky on Firefox and Chrome 2015-12-21 18:45:20 +05:00
Zia Fazal
bb1c86baff added a slug field to reference template asset using this field
removed print statement

removed unnecessary status code assertion
2015-12-21 17:48:56 +05:00
Usman Khalid
43b5fcc069 Revert changes to moment-with-locales. 2015-12-21 17:43:48 +05:00
Usman Khalid
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +05:00
Ben Patterson
6c261200c7 Mark test as flaky. See TNL-3943. 2015-12-20 09:28:09 -05:00
Ben Patterson
bf8a30d71b bok-choy: Additional detail to assist when a course fixture error surfaces.
When receiving an error explained in TNL-3942, I found this kind of
instrumentation to be helpful.
2015-12-20 09:19:55 -05:00
David Ormsbee
88c7d58313 Modify CourseOverviews to create course image thumbnails.
Course teams occasionally upload very large files as their course
image. Before this commit, those images would be used directly in
the student's dashboard, sometimes leading to MBs worth of image
data on that page. With this commit, we now auto-generate small
and large thumbnails of configurable size. The Student Dashboard
and Course About pages will make use of this new functionality
(CourseOverview.image_urls), but the behavior of
CourseOverview.course_image_url will not change.

Note that the thumbnails are still created in the contentstore,
and sit alongside their originals.

What's included:

1. Multiple sizes, currently starting with "raw", "small", and
   "large". This falls back to the current behavior automatically in
   the case where thumbnails don't exist or this feature has been
   disabled in configuration.

2. Django admin based configuration for image sizes and whether
   to enable the functionality at all. Note that to regenerate
   images, you'd need to wipe the CourseOverviewImageSet model
   rows -- it doesn't do that automatically. This is partly because
   it's a very rare operation, and partly because I'm not entirely
   sure what the longer term invalidation strategy should be in a
   world where we might potentially have multiple themes. The
   flexible configuration was intended to allow better customization
   and theming.

3. The Course About pages also use the new thumbnail functionality,
   as an example of "large". This is in addition to the "small"
   used on the student dashboard.

Things I'm punting on for now (followup PRs welcome!):

1. Bringing the thumbnails to course discovery. A quick attempt
   to do so showed that it wasn't getting properly invalidated
   and updated when publishes happen (so the old image still showed
   up). It probably has something to do with when we do the
   re-indexing because it stores this data in elasticsearch, but
   I'm not going to chase it down right now.

2. Center-cropping. While this is a nice-to-have feature, the
   behavior in this PR is no worse than what already exists in
   master in terms of image distortion (letting the browser handle
   it).

3. Automated invalidation of the images when a new config is
   created.
2015-12-18 20:03:09 -05:00