Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,504 Commits 1 Branch 0 Tags
2bf25b2f51bf706562087f096ce7c72c4bc9d1bb
Commit Graph

13076 Commits

Author SHA1 Message Date
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
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
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
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
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
Frances Botsford
7338f4bf31 adjust empty courseware search spacing 2015-12-21 09:26:32 -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
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +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
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
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align 
[SWAT-97] Logistration alignment and padding.
 2015-12-18 15:58:53 +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 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
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156 
leanModal fixes
 2015-12-17 15:17:51 -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
Frances Botsford
0b9da334e2 adjusted styles for bookmarking 2015-12-17 12:25:09 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Frances Botsford
53eb9e605b layout fixes 2015-12-17 22:10:22 +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
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
muzaffaryousaf
50a6b3b684 Resolving the jsHint warnings. 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
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
unawaz
a585fc7935 [SWAT-97] Logistration alignment and padding. 2015-12-17 16:07:42 +00: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
frances botsford
7c017969ca Merge pull request #10997 from edx/frances/lms-pagination-sass 
Make pagination pattern sass globally available in LMS
 2015-12-16 15:47:36 -05:00
clrux
3275b9d605 Merge pull request #10913 from edx/clrux/ac-177 
LMS: addressing contrast issues on the Progress page
 2015-12-16 15:12:42 -05:00