Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,438 Commits 1 Branch 0 Tags
ee4300dd7b6f4c57e5df3fbcdfe3a8f385480cb5
Commit Graph

34438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -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
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
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
6bc6b3f001 Merge pull request #10989 from edx/jia/MA-1046 
MA-1046 added valid form field test
 2015-12-16 21:22:26 +05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire 
Delete dead SUBDOMAIN_BRANDING setting.
 2015-12-16 11:09:12 -05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178 
LMS: addressing contrast on the Instructor dashboard
 2015-12-16 11:08:49 -05:00
Nimisha Asthagiri
e96e65a377 generate_course_overview management command error handling 2015-12-16 10:53:44 -05:00
Diana Huang
98f73c062b Merge pull request #10981 from edx/rc/2015-12-16 
Rc/2015 12 16
 2015-12-16 10:35:54 -05:00
Diana Huang
043584eaee Merge pull request #10983 from edx/diana/markup-helpers 
Add new i18n markupsafe helper methods.
 2015-12-16 09:53:10 -05:00
wajeeha-khalid
0847183458 MA-1046 added valid form field test 2015-12-16 19:06:35 +05:00
raeeschachar
edd4781d41 Merge pull request #10975 from edx/raees/chrome-bok-choy-test-toggle-by-clicking-note 
Fixed toggle by clicking on the note failing on Chrome
 2015-12-16 18:38:13 +05:00
Saleem Latif
22653b18d9 Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-16 10:30:02 +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
John Eskew
65ec853864 Merge pull request #10698 from edx/jeskew/TNL-3795_fix 
Protect against divide by zero in DataDog event.
 2015-12-15 16:34:28 -05:00
Diana Huang
fab7a071e3 Add new helper methods. 2015-12-15 16:21:14 -05:00
John Eskew
5382c86c1c Protect against divide by zero in DataDog event. 
Add test for zero total/max score in a problem.
 2015-12-15 15:10:57 -05:00
Douglas Hall
34b01bf8b7 Merge pull request #10569 from edx/muhhshoaib/PHX-161-studio-set-review-rules-for-proctored-exam 
PHX-161 Studio: Set Review Rules for a Proctored Exam
 2015-12-15 15:05:28 -05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Jesse Zoldak
9e5eda0ab6 Merge pull request #10999 from edx/revert-10506-shr/bug/TNL-2622-course_import_status_message 
Revert "set path explicitly for storing cookie"
 2015-12-15 14:21:15 -05:00
Renzo Lucioni
c14548d15f Merge pull request #10963 from edx/renzo/remove-dead-code 
Remove dead code
 2015-12-15 14:11:51 -05:00
Jesse Zoldak
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
clrux
92fa4d07cd Merge pull request #10917 from edx/clrux/ac-190 
CMS: removing H1 and H2, adding H4, H5, and H6 to TinyMCE
 2015-12-15 11:36:30 -05:00
Diana Huang
1ebb78c9fa Merge pull request #10996 from edx/ormsbee/revert_staff_info 
Revert "Remove staff debug category type whitelist."
 2015-12-15 10:54:28 -05:00