Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Nimisha Asthagiri
a2daa8d0fd Move generate_course_blocks to block_structure 2017-03-20 00:04:16 -04:00
Nimisha Asthagiri
6a954c1e4e Merge pull request #14690 from edx/neem/fix-entrance-exam-grades 
Fix grading for Entrance Exams
 2017-03-17 19:04:35 -04:00
Nimisha Asthagiri
54d938cab5 Fix grading for Entrance Exams 
TNL-6227
 2017-03-17 17:32:36 -04:00
Uzair Rasheed
a8277a6a64 Merge pull request #14658 from edx/uzairr/TNL-6639 
TNL-6639 Add timeout in request to xqueue
 2017-03-18 02:00:38 +05:00
Nimisha Asthagiri
a77c345a58 Merge pull request #14689 from edx/neem/fix-milestone-grades 
Fix grading for Gated Subsections
 2017-03-17 16:10:12 -04:00
AsadAzam
6a85cd1a7c Merge pull request #14712 from edx/TNL-6637-whitelist-logs 
Added logs for adding/removing students from whitelist
 2017-03-17 21:11:29 +05:00
Asad Azam
9ae3a3210b Added logs for adding/removing students from whitelist 2017-03-17 17:48:19 +05:00
uzairr
d117222f7c Add timeout in request to xqueue 2017-03-17 10:23:20 +00:00
M. Rehan
3c040b93c2 Merge pull request #14704 from edx/mrehan/strip-edx-video-id 
TNL-5769 – strip video id on saving the video
 2017-03-17 12:56:41 +05:00
Muhammad Ammar
7766e15a65 Merge pull request #14684 from edx/ammar/backend-changes-to-support-hls 
backend changes to support hls
 2017-03-17 12:46:26 +05:00
Nimisha Asthagiri
634ac8a825 Still compute grades asynchronously when PersistentGrades is enabled 2017-03-16 18:26:17 -04:00
Qubad786
4a2589c7c3 strip video id on saving the video 2017-03-16 19:48:46 +05:00
muhammad-ammar
5ec5e97a0c backend changes to support hls 
TNL-6541
 2017-03-16 19:30:49 +05:00
Sanford Student
9a44777335 changes is score higher to use gtoe 
for TNL-6644
 2017-03-16 10:25:37 -04:00
Nimisha Asthagiri
cfb032a50c Fix grading for Gated Subsections 
TNL-5955
 2017-03-15 17:16:20 -04:00
Eric Fischer
39363c1171 All modes are valid bulk email targets 2017-03-14 14:43:40 -04:00
Simon Chen
5cd3a86382 Merge pull request #14668 from edx/schen/add_logging 
Add logging for user cookie send for sailthru
 2017-03-10 13:29:40 -05:00
Joel Barciauskas
630985b3cc Wrap all newrelic dependencies in a check to see if the module is loaded 2017-03-10 12:22:08 -05:00
Simon Chen
764ef48332 Add logging for user cookie send for sailthru 2017-03-10 10:10:37 -05:00
Jillian Vogel
25383a603e Ensure Enterprise-integrated courses require user consent before granting access to Wiki and Discussion forum. 
* User-facing links are gated; internal services are not.
* Adds view decorator data_sharing_consent_required
* Renames `get_course_specific_consent_url` to `get_enterprise_consent_url`,
  which now checks `consent_needed_for_course` before returning a consent URL.
 2017-03-10 09:29:24 +10:30
J. Cliff Dyer
21b224ec59 Give instructor task knowledge of new rescore. 
* Bump xblock version
* Update rescore instructor task helper to handle generic rescore.
* Add set_score to grade signal handler.
 2017-03-09 14:59:06 -05:00
rabiaiftikhar
ccfa3ea74d TNl-6610 Fix "more" menu on discussion post for global staff. 2017-03-09 14:16:31 +05:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Albert (AJ) St. Aubin
22f58606af Merge pull request #14564 from edx/aj/TNL-6347_headers 
Aj/tnl 6347 headers
 2017-03-08 13:27:40 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Albert St. Aubin
7c7c27183f changes header levels for a11y 
TNL-6347
 2017-03-08 11:45:45 -05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Eric Fischer
50371ee59a Allow masquerade on progress page 2017-03-06 16:53:26 -05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Eric Fischer
83f2be4929 Merge pull request #14588 from edx/efischer/kill_stuff 
Kill edx-reverification-block
 2017-03-06 09:29:36 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
Hasnain
d6d2b2d50f Add program marketing view 
This change adds the URL configuration and Django view required
to implement a program marketing page. It is left to theme builders
to implement a template that fulfills their own UX requirements.

WL-766
 2017-03-02 14:38:01 -05:00
Nimisha Asthagiri
952143b776 Block Structure Storage management command 
TNL-6524
 2017-03-02 12:07:26 -05:00
Nimisha Asthagiri
00d466224e Consolidate Block Structure folders 
TNL-6518
 2017-03-01 21:19:28 -05:00
Sanford Student
576516b599 ensure that modified start/end are treated as UTC by django 2017-03-01 15:15:17 -05:00
Eric Fischer
7b85c0ea00 Remove in-course reverification 
This is unused, and will no longer be supported on edx.org. Also adds a
DeprecatedModel utility class.

TNL-6126
 2017-03-01 10:46:29 -05:00
Nimisha Asthagiri
090fc12b5a Merge pull request #14512 from edx/beryl/cbs_waffled_manager 
Storage-backed Versioned Block Structures: Manager and Store
 2017-03-01 10:26:56 -05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
02c24cb259 Block Structure query count and API changes 2017-02-28 23:54:57 -05:00
Nimisha Asthagiri
1ee2c27f49 Storage-backed versioned Block Structures: Manager and Store 2017-02-28 23:54:57 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00
George Song
5e21f64c2c Merge pull request #14585 from vagupta16/fix-course-about-invalid-course-id-upstream 
Ensure that course_about uses a valid course ID
 2017-02-28 09:32:16 -08:00
David Ormsbee
39fc6ce1f5 Merge pull request #14586 from edx/ormsbee/test_bulk_ops_1 
Move more tests to use bulk_operations
 2017-02-28 09:42:50 -05:00
Eric Fischer
715076a48b Cleaner grades exception handling 2017-02-27 13:53:31 -05:00
cahrens
8fedc08c2a Support web fragments for tabs. 2017-02-24 17:55:32 -05:00
David Ormsbee
ca1f76cedb Move more tests to use bulk_operations. 2017-02-24 15:21:45 -05:00
Varun Gupta
c235ad70bd ensure that course_about uses a valid course ID 2017-02-24 11:17:16 -08:00