Commit Graph

6479 Commits

Author SHA1 Message Date
Peter Fogg
77aa07544e Internationalize course info sidebar default. 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools."
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests.
ECOM-2809
2016-02-03 13:58:23 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools.
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
2016-02-03 13:58:22 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs
ECOM-2678
2016-02-03 12:20:53 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup
CMS: Removing H1 and H2 from editor options; updating editor icons
2016-02-03 09:28:44 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Toby Lawrence
78370f3644 Merge pull request #11400 from edx/PERF-258
Add the ability to exclude files from URL canonicalization.
2016-02-02 11:28:05 -05:00
Calen Pennington
dffbc69a3c Merge pull request #11329 from cpennington/fix-cert-type-names
Fix the help text for cert_name_short and cert_name_long
2016-02-02 11:19:09 -05:00
Calen Pennington
1d60c40bd2 Merge pull request #11215 from CredoReference/xblock_aside_example
XBlockAsides: little example of usage
2016-02-02 10:45:20 -05:00
Toby Lawrence
e57d1a2006 Add leading period so we don't get partial matches on extensions. 2016-02-02 10:07:13 -05:00
Toby Lawrence
1183f6cec9 Add the ability to exclude files from URL canonicalization.
To be able to more easily deal with same-origin issues, due to some course assets being loaded in an iframe, we're adding the ability to specify file extensions that should be excluded from URL canonicalization.  The default value is simply 'html', which means we won't rewrite asset links that point to files ending in .html.  Thus, they'll be loaded from the same origin as the parent page, and voila, no SOP issues.
2016-02-01 21:44:35 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Calen Pennington
8acb93690f Fix the help text for cert_name_short and cert_name_long
This resolves the textual issue in [ECOM-2907] (https://openedx.atlassian.net/browse/ECOM-2907).
There will also be a data fix.
2016-02-01 17:02:14 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Clinton Blackburn
29f0a5b172 Updated XModule opaque-keys dependency
Using edx-opaque-keys instead of opaque-keys
2016-01-27 17:19:39 -05:00
Muhammad Rehan
352e2190eb improve get_items and has_path_to_root with temporary caches. 2016-01-23 01:50:05 +05:00
Mushtaq Ali
70b55cf1d4 Append Item only if it has path to root.
Code refactor
2016-01-23 00:21:32 +05:00
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128
Added CCXCon app and CCXCon URL in course advanced settings
2016-01-20 14:28:48 -05:00
Giovanni Di Milia
bb36ab013f Added CCXCon app
The CCXCon app is used to push course updated to the CCXCon
 externale service.
2016-01-20 10:47:37 -05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event
Avoid emitting play_video event during buffering
2016-01-20 17:59:04 +05:00
muhammad-ammar
83be42edd0 once again new logic 2016-01-19 18:31:08 +05:00
muhammad-ammar
c4065f7b33 Avoid emitting play_video event during buffering
TNL-2178
2016-01-18 19:55:37 +05:00
Christina Roberts
f1802d98df Merge pull request #11233 from edx/christina/undeprecate-teams
Un-deprecate teams setting.
2016-01-15 10:14:15 -05:00
cahrens
a47be54050 Un-deprecate teams setting.
TNL-3803
2016-01-15 09:18:46 -05:00
Edward Zarecor
c37378fe29 Merge pull request #11231 from edx/release
Merging changes for the patch release back to master
2016-01-14 14:37:43 -05:00
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs
Crush down images.
2016-01-14 09:42:17 -05:00
Edward Zarecor
546610084c Removing CDN RPC
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
2016-01-13 21:46:57 -05:00
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -05:00
Dmitry Viskov
efb86f2169 XBlockAsides Hello world example 2016-01-14 03:19:23 +03:00
Toby Lawrence
451b0a9c66 Revert "Crush down images."
This reverts commit 8402be3b20.
2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images.
Ran these suckers through ImageOptim, which crunched 'em down real nice.
2016-01-13 18:29:00 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None.
Added tests & general message to js when parsing fails.

TNL-3989
2016-01-12 09:47:51 -05:00
Matjaz Gregoric
95884642a2 Mark sequence link-color scss variable default.
There's already a global $link-color variable defined in
lms/static/sass/base/_variables.scss. Mark the $link-color
variable in sequence scss file with !default, so that the
global $link-color variable gets used, if defined.
2016-01-11 08:52:21 +01:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224
[PERF-224] Serve course assets from a CDN
2016-01-05 13:40:54 -05:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN.
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
2016-01-05 10:24:44 -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
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
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
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -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
Ben Patterson
92f4d41fac Revert "Append block item only if it has path to root" 2015-12-21 14:33:32 -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