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
Jesse Zoldak
ddf2f7649e
Merge pull request #11027 from edx/revert-11024-pdesjardins/DOC-2543
...
Revert "Edited the text strings in the default template for web certificates to remove wording specific to edx.org"
2015-12-17 16:11:00 -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
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
0dce7efdba
Merge pull request #10850 from edx/kill-graphical-slider-tool
...
Remove the graphical slider tool
2015-12-17 14:50:22 -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
Bill DeRusha
08d1268c28
Disable cert generation for audit only courses
2015-12-17 13:23:38 -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
Usman Khalid
27dcb811e7
Speedup the bookmarks tests.
2015-12-17 22:10:22 +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
muzaffaryousaf
3792943960
Fixing the failing tests for XMLModule.
2015-12-17 22:07:35 +05:00
muzaffaryousaf
1589ea1718
Bokchoy test for update, publish & verify unit name in breadcrumb trail.
2015-12-17 22:07:35 +05:00
Usman Khalid
778b921c41
Do not include path or display name in the XBlockService cache.
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
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
Piotr Mitros
a543769994
Merge pull request #9733 from edx/pmitros/update-completion-xblock
...
Bring DoneXBlock to production-level code
2015-12-17 10:38:27 -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
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
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
Piotr Mitros
31da0483bd
Moving completion XBlock to production, tweaking PEP8, analytics, etc.
2015-12-16 14:38:05 -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
Frances Botsford
e18a6e28ca
make pagination pattern sass globally available in LMS
2015-12-16 12:58:16 -05:00
Diana Huang
ba526f4f39
Merge pull request #11008 from edx/release
...
Release
2015-12-16 12:05:20 -05:00
Nimisha Asthagiri
67ec142259
Merge pull request #10982 from edx/course_overview/management_command
...
generate_course_overview management command error handling
2015-12-16 11:33:01 -05:00
