Commit Graph

6522 Commits

Author SHA1 Message Date
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -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
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master
Merge release into master
2015-12-22 09:11:43 -05:00
Peter Desjardins
2bf25b2f51 Merge pull request #11043 from edx/pdesjardins/DOC-2543-b
Edit text strings in default template for web certificates to make them more generally applicable
2015-12-22 08:56:57 -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
Saleem Latif
475429c0a6 Web Certificates: Platform Branding integration 2015-12-22 11:50:15 +05:00
Peter Desjardins
451ae3b2e7 Edited text strings in the default template for web certificates to remove wording specific to edx.org. Addresses DOC-2543. 2015-12-21 16:31:17 -05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
Saleem Latif
484e6ef74d skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-21 12:57:39 -05:00
Saleem Latif
5ccc520bb3 Remove unused imports 2015-12-21 12:56:35 -05:00
Saleem Latif
76696aeba9 Add i18n to strings 2015-12-21 12:56:28 -05:00
Saleem Latif
33bbc8d77e display certificate generate history in reverse chronological order 2015-12-21 12:56:20 -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
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
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
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
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
Sarina Canelake
96ddf544ff Remove Pylint violations 2015-12-17 16:29:28 -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
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
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
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
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
Peter Fogg
24edef8998 Add ungenerated migrations due to field default changes. 2015-12-17 10:18:51 -05:00
Matt Drayer
63d0c74439 Merge pull request #11018 from edx/saleem-latif/SOL-1528
SOL-1528: Generate Certificates for whitelisted students even if they have existing (notpassing, error etc.) certificates
2015-12-17 09:43:48 -05:00
wajeeha-khalid
e37f8ff767 Merge pull request #10905 from edx/jia/MA-1051
MA-1051 - DiscussionAPI: Remove http errors from api.py
2015-12-17 15:42:40 +05:00
Saleem Latif
fb0fbbbaa4 skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-17 12:25:42 +05:00
Matt Drayer
abb8484ec2 Merge pull request #10974 from edx/saleem-latif/SOL-1418-review-changes
SOL-1418: display certificate generate history in reverse chronological order
2015-12-17 00:02:13 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool
WIP for financial support tool.
2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c 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-16 14:17:19 -05:00
Bill DeRusha
1846353a1f Fix auto set deadlines on publish 2015-12-16 13:58:13 -05:00
wajeeha-khalid
588833ff43 MA-1051: DiscussionAPI - Removed http errors from api.py and refactored to more specific errors 2015-12-16 21:23:51 +05:00
wajeeha-khalid
0847183458 MA-1046 added valid form field test 2015-12-16 19:06:35 +05:00
Saleem Latif
300825efc2 Remove unused imports 2015-12-16 10:27:24 +05:00
Saleem Latif
da0664c5fe Add i18n to strings 2015-12-16 10:26:23 +05:00
Saleem Latif
8b2c4994fa display certificate generate history in reverse chronological order 2015-12-16 10:22:56 +05:00
Renzo Lucioni
da16b3da22 Remove dead code
Deletes unused code from an old implementation of microsites.
2015-12-14 16:38:14 -05:00