Commit Graph

5037 Commits

Author SHA1 Message Date
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
Matt Drayer
b549adf476 Merge pull request #10623 from eduNEXT/fmo/wiki-support-for-microsites
WIP wiki support for microsite templates
2016-01-12 14:27:27 -05:00
Christina Roberts
6f66483876 Merge pull request #11202 from edx/release
Release for Jan 12, 2016
2016-01-12 11:29:42 -05:00
Toby Lawrence
775c3cac2a Merge pull request #11190 from edx/PERF-227
Disable Optimizely in the courseware view.
2016-01-12 11:09:55 -05:00
Felipe Montoya
f2a6a27ec9 Adding support for microsite template_paths on django templates
Stripping the leading / for the django_templates finder

Enabling the microsite configurations before running django.setup()

Adding only the templates directory before startup

Adding the missing overrides file at the django templates main

Using the comp_theming way of overriding css

Adding test for the microsite_template_path filter
2016-01-12 10:34:00 -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
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages
TNL-3968
2016-01-12 13:49:30 +05:00
Adam
e4ab6dc2c3 Revert "Calculator layout and help popup fixes" 2016-01-11 12:47:05 -05:00
Toby Lawrence
09f2040cbf Disable Optimizely in the courseware view. 2016-01-11 10:57:05 -05:00
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images
Shrink images
2016-01-08 13:13:02 -05:00
Douglas Hall
c4aa758d8c Merge pull request #11155 from edx/douglashall/HOL-18/register_form_override
HOL-18 Register form microsite override
2016-01-08 12:55:00 -05:00
David Baumgold
80836087f7 Merge pull request #11165 from edx/remove-header_extra.html
Remove unused header_extra.html file
2016-01-08 10:00:37 -05:00
Douglas Hall
c2058dbec5 Split register form out into a separately include template so that microsites can override it 2016-01-07 11:58:16 -05:00
David Baumgold
562079460b Merge pull request #11154 from ovnicraft/patch-2
Remove duplicate import
2016-01-07 11:57:23 -05:00
David Baumgold
032305df3d Remove unused header_extra.html file 2016-01-07 11:45:16 -05:00
Calen Pennington
bd7e4dd3ab Shrink images using trimage
lms/static/images/wmd-buttons-transparent.png       | Bin 9698 -> 7046 bytes
 lms/static/images/wmd-buttons.png                   | Bin 7465 -> 5970 bytes
 .../credit_notifications/edx-logo-header.png        | Bin 1894 -> 1225 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_120.jpg        | Bin 3168 -> 2752 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_30.jpg         | Bin 957 -> 648 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_50.jpg         | Bin 1362 -> 1048 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_500.jpg        | Bin 15852 -> 13940 bytes
 .../f0d065035a5c4d32df318fbc54138765_120.jpg        | Bin 3168 -> 2752 bytes
 .../f0d065035a5c4d32df318fbc54138765_30.jpg         | Bin 957 -> 648 bytes
 .../f0d065035a5c4d32df318fbc54138765_50.jpg         | Bin 1362 -> 1048 bytes
 .../f0d065035a5c4d32df318fbc54138765_500.jpg        | Bin 15852 -> 13940 bytes
 themes/edge.edx.org/lms/static/images/logo.png      | Bin 7465 -> 4574 bytes
 themes/edx.org/cms/static/images/studio-logo.png    | Bin 4782 -> 4779 bytes
 themes/edx.org/lms/static/images/logo-large.png     | Bin 4581 -> 3367 bytes
 themes/edx.org/lms/static/images/logo.png           | Bin 1244 -> 1184 bytes
 .../lms/static/images/profiles/default_120.png      | Bin 6398 -> 3252 bytes
 .../lms/static/images/profiles/default_30.png       | Bin 993 -> 522 bytes
 .../lms/static/images/profiles/default_50.png       | Bin 2068 -> 1035 bytes
 .../lms/static/images/profiles/default_500.png      | Bin 91560 -> 0 bytes
 themes/red-theme/lms/static/images/logo.png         | Bin 909 -> 559 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
2016-01-07 10:48:43 -05:00
Matt Drayer
b7b8c745d6 Merge pull request #11139 from edx/asadiqbal08/WL-242
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
2016-01-07 10:32:40 -05:00
Cristian Salamea
3725472034 Remove duplicate import 2016-01-06 18:49:57 -05:00
Adam
4c5c8c18a3 Merge pull request #10648 from OmarIthawi/edraak/calculator-fixups
Calculator layout and help popup fixes
2016-01-06 15:32:58 -05:00
Matt Drayer
083ff7f0ef Merge pull request #11150 from edx/release
2016-01-06 Release
2016-01-06 13:51:49 -05:00
Omar Al-Ithawi
e21505b76a Fixed issues in the calculator help
- Corrected the direction of the English equations
  - TNL-3798: Removed the greek letters
  - The equal (=) button is now the default submit button in the calculator, instead of the help button
  - TNL-3798: Removed the subscript note
  - Added some comments for the translators in the calculator
  - Using `fixed` position for the calculator for best mobile/desktop look
2016-01-06 17:52:44 +02:00
Christine Lytwynec
b1e31c133f Merge pull request #11098 from edx/clytwynec/ac-303
remove aria-hidden from staff lms controls
2016-01-05 10:09:21 -05:00
Douglas Hall
e7dc6fcfe5 Rolling back template inheritance change that was causing child templates to break 2016-01-05 09:40:34 -05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page.
-Added test for TNL-3556.
2016-01-05 17:50:23 +05:00
asadiqbal
47827ecb6f WL-242 2016-01-05 14:25:22 +05:00
Carol Tong
e7dab0dfbb Merge pull request #11126 from edx/carol/doc/cohort_help_target
Fix cohort doc help targets in Instructor Dashboard
2016-01-04 17:02:31 -05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
David Baumgold
c6ed893df9 Merge pull request #11109 from ovnicraft/patch-1
Remove duplicate import
2016-01-04 14:36:58 -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
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Cristian Salamea
c7c542d7da Remove duplicate import 2015-12-30 21:51:14 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form.
ECOM-3318
2015-12-30 13:30:43 -05:00
Christine Lytwynec
c2e325020f remove aria-hidden from staff lms controls 2015-12-30 11:11:36 -05:00
Christine Lytwynec
bb329c7b6f add sr text for show/hide answer button 2015-12-29 17:03:32 -05:00
Chris Dodge
0b4f3599b3 Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running 2015-12-27 19:18:07 -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
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
Saleem Latif
3967d8093d Move get_logo_url from branding/__init__.py to branding/api.py for consistency. 2015-12-22 11:50:16 +05:00
Matt Drayer
cf9468eaf0 Merge pull request #11007 from edx/asadiqbal08/SOL-1492
asadiqbal08/SOL-1492 - WebCerts: Generate Cert from Support Tool
2015-12-21 09:50:41 -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
asadiqbal
37aebaa73b SOL-1492 2015-12-18 18:19:17 +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
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156
leanModal fixes
2015-12-17 15:17:51 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination
TNL-2490
2015-12-17 22:07:34 +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