Commit Graph

40279 Commits

Author SHA1 Message Date
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
6d5047ef12 Merge pull request #10898 from edx/ormsbee/dashboard_thumbnails
Modify CourseOverviews to create course image thumbnails.
2015-12-18 20:57:02 -05:00
Ned Batchelder
756941524c Update to latest edx-lint 2015-12-18 20:56:07 -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
David Ormsbee
7a287dc65f Merge pull request #10970 from open-craft/staff-debug-everywhere-fix
Disable staff markup on 'detached' blocks.
2015-12-18 17:47:59 -05:00
Piotr Mitros
a237b007b1 Merge pull request #11029 from edx/pmitros/xblock-test-case
First pass at an API for XBlock testing.
2015-12-18 13:18:06 -05:00
Piotr Mitros
ff7fdb807e First pass at an API for XBlock testing. 2015-12-18 11:07:39 -05:00
Sarina Canelake
ee4ab20500 Merge pull request #10986 from edx/sc/pylint
Remove Pylint violations
2015-12-18 09:28:48 -05:00
asadiqbal
37aebaa73b SOL-1492 2015-12-18 18:19:17 +05:00
M. Rehan
1176214621 Merge pull request #10617 from edx/mrehan/TNL-3477
Fix: Disable capa buttons to protect against race condition that may occur between two competing AJAX calls.
2015-12-18 16:49:16 +05:00
Ayub-Khan
a6fd6ca5ec fix html escape error
TNL-3822
2015-12-18 16:02:29 +05:00
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align
[SWAT-97] Logistration alignment and padding.
2015-12-18 15:58:53 +05:00
Matjaz Gregoric
585c64f282 Enable staff debug everywhere except on detached blocks.
Staff markup was enabled on all block types in
https://github.com/edx/edx-platform/pull/10903

This works well inside the courseware, but it breaks layout of the course about
page, which is also an XModule, see:
https://github.com/edx/edx-platform/pull/10903#issuecomment-164266342

This commit disables staff markup/staff debug on all blocks except
blocks tagged with 'detached'. Detached blocks include course about
and info pages, static tabs.
2015-12-18 08:19:57 +01:00
Mushtaq Ali
7f6e8b88e2 Merge pull request #10994 from edx/mushtaq/improve_get_item
Append block item only if it has path to root
2015-12-18 03:30:46 +05:00
Sarina Canelake
96ddf544ff Remove Pylint violations 2015-12-17 16:29:28 -05:00
Jesse Zoldak
ddf2f7649e Merge pull request #11027 from edx/revert-11024-pdesjardins/DOC-2543
Revert "Edited the text strings in the default template for web certificates to remove wording specific to edx.org"
2015-12-17 16:11:00 -05:00
Jesse Zoldak
0aa196c48b Revert "Edited the text strings in the default template for web certificates to remove wording specific to edx.org" 2015-12-17 16:10:05 -05:00
Peter Fogg
30f25105e9 Support tool for changing enrollments.
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
2015-12-17 16:03:58 -05:00
Peter Desjardins
ee4300dd7b Merge pull request #11024 from edx/pdesjardins/DOC-2543
Edited the text strings in the default template for web certificates to remove wording specific to edx.org
2015-12-17 15:42:32 -05:00
Mushtaq Ali
0ae51c2142 Append Item only if it has path to root.
Code refactor
2015-12-18 01:26:21 +05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156
leanModal fixes
2015-12-17 15:17:51 -05:00
Bill DeRusha
e63f0f922c Merge pull request #10984 from edx/bderusha/studio-audit-cert
Disable certificate template creation for audit only courses
2015-12-17 14:53:40 -05:00
Sarina Canelake
0dce7efdba Merge pull request #10850 from edx/kill-graphical-slider-tool
Remove the graphical slider tool
2015-12-17 14:50:22 -05:00
Peter Desjardins
a26da6e676 Edited the text strings in the default template for web certificates. Removed wording that applied specifically to edx.org. Reworded strings so that they will read correctly when the value of platform_name or cert_type requires the a or an article. Addresses DOC-254. 2015-12-17 14:31:06 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Bill DeRusha
08d1268c28 Disable cert generation for audit only courses 2015-12-17 13:23:38 -05:00
Frances Botsford
0b9da334e2 adjusted styles for bookmarking 2015-12-17 12:25:09 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
27dcb811e7 Speedup the bookmarks tests. 2015-12-17 22:10:22 +05:00
Frances Botsford
53eb9e605b layout fixes 2015-12-17 22:10:22 +05:00
Usman Khalid
1c387e4f41 Address review feedback. 2015-12-17 22:10:21 +05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
muzaffaryousaf
3792943960 Fixing the failing tests for XMLModule. 2015-12-17 22:07:35 +05:00
muzaffaryousaf
1589ea1718 Bokchoy test for update, publish & verify unit name in breadcrumb trail. 2015-12-17 22:07:35 +05:00
Usman Khalid
778b921c41 Do not include path or display name in the XBlockService cache. 2015-12-17 22:07:35 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination
TNL-2490
2015-12-17 22:07:34 +05:00
Usman Khalid
4304c66c54 Performance optimizations and cache to keep the bookmarks info updated.
The cache uses the bookmarks.XBlockCache model.

TNL-1945
2015-12-17 22:07:34 +05:00
cahrens
dbb5232681 Try changing how the viewer is dismissed. 2015-12-17 22:07:34 +05:00
muzaffaryousaf
50a6b3b684 Resolving the jsHint warnings. 2015-12-17 22:07:34 +05:00
muzaffaryousaf
7413484b8d Resolving the moment.js issues
TNL-1958
2015-12-17 22:07:33 +05:00
Muhammad Ammar
1e9907a8c8 Bookmark Events
TNL-1944
2015-12-17 22:07:33 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware.
TNL-1957
2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View
TNL-1958
2015-12-17 22:07:31 +05:00
Usman Khalid
cfd1fabb67 Added type field to bookmark resource. 2015-12-17 22:07:31 +05:00
muzaffaryousaf
1616de5051 Bookmarks API.
TNL-2180
2015-12-17 22:07:30 +05:00
Peter Fogg
283623ab35 Merge pull request #11019 from edx/peter-fogg/add-ungenerated-migrations
Add autogenerated migrations due to field default changes.
2015-12-17 11:55:55 -05:00
Bill DeRusha
d9f6f90c3d Merge pull request #11010 from edx/bderusha/auto-deadlines
Fix auto set deadlines on publish
2015-12-17 11:28:46 -05:00
unawaz
a585fc7935 [SWAT-97] Logistration alignment and padding. 2015-12-17 16:07:42 +00:00
Piotr Mitros
a543769994 Merge pull request #9733 from edx/pmitros/update-completion-xblock
Bring DoneXBlock to production-level code
2015-12-17 10:38:27 -05:00