Commit Graph

34516 Commits

Author SHA1 Message Date
Peter Fogg
3149aaa319 Add options trailing slashes to the Enrollment API.
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
2015-12-22 14:52:27 -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
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
Matt Drayer
ca2b8c2749 Merge pull request #10988 from edx/saleem-latif/SOL-1493
SOL-1493: Web Certificates: Platform Branding integration
2015-12-22 07:57:57 -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
Usman Khalid
a93ef10f8c Merge pull request #11016 from edx/ekafeel/bookmarks-limit
Limit the number of bookmarks a learner can add in a course
2015-12-22 11:52:17 +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
Piotr Mitros
411957612b Merge pull request #11032 from edx/pmitros/external-xblock-tests
Allow us to run tests from external XBlock repositories
2015-12-21 15:36:29 -05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
Peter Fogg
bc121bfb3e Merge pull request #11026 from edx/patch/2015-12-21
Patch 2015-12-21
2015-12-21 14:49:09 -05:00
Piotr Mitros
ea27d19cb3 Allow us to run tests from external XBlock repositories 2015-12-21 14:44:25 -05:00
Ben Patterson
92f4d41fac Revert "Append block item only if it has path to root" 2015-12-21 14:33:32 -05:00
clrux
ddc6b5ac6f Merge pull request #11041 from edx/clrux/ac-295
LMS: Adding missing third topic state
2015-12-21 13:11:43 -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
268db9080a Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-21 12:56:42 -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
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
ehtesham
3385d1e128 TNL-2810 backend implementation to limit the maximum bookmarks per course 2015-12-21 22:17:58 +05:00
Chris Rodriguez
c603380a0b LMS: Adding missing third topic state 2015-12-21 12:13:47 -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
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
Ned Batchelder
190304be0d Merge pull request #11030 from edx/ned/update-pylintrc
Update to latest edx-lint
2015-12-21 09:51:40 -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
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
Frances Botsford
7338f4bf31 adjust empty courseware search spacing 2015-12-21 09:26:32 -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
dd5917c6c4 Merge pull request #11035 from edx/usman/bookmarks-layout-issues
Layout fixes required due to styling changes.
2015-12-21 17:13:38 +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
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