Commit Graph

12472 Commits

Author SHA1 Message Date
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
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
Sarina Canelake
ee4ab20500 Merge pull request #10986 from edx/sc/pylint
Remove Pylint violations
2015-12-18 09:28:48 -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
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
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
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
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
muzaffaryousaf
1589ea1718 Bokchoy test for update, publish & verify unit name in breadcrumb trail. 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
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
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
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
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