Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rabia Iftikhar
dfdf1a4ad3 Merge pull request #17068 from edx/ri/EDUCATOR-2016-suspicious-proctored-exams 
EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious
 2018-01-19 22:54:19 +05:00
Jeremy Bowman
67f4907ef2 Merge pull request #17243 from edx/jmbowman/PLAT-1889 
PLAT-1889 Fix URL config and reversal issues
 2018-01-19 12:50:16 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
sanfordstudent
2d3f9da2aa Merge pull request #17250 from edx/sstudent/reduce_logging 
reducing logging for EDUCATOR-1290
 2018-01-19 12:40:05 -05:00
rabia23
222794ee59 EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious 2018-01-19 16:50:16 +00:00
edx-cache-uploader-bot
f9ac6f1e2f Updating migrations 2018-01-19 11:39:24 -05:00
Sanford Student
af0909e8cf reducing logging for EDUCATOR-1290 2018-01-19 11:34:44 -05:00
Jeremy Bowman
ca84751bbd PLAT-1889 Fix URL config and reversal issues 2018-01-19 11:02:06 -05:00
Calen Pennington
158ba153f5 Allow space-separate xsslint pragrma disabling 2018-01-19 10:41:04 -05:00
Nadeem Shahzad
17dd276d16 Merge pull request #17201 from edx/nadeem/OPS-1008 
Remove edx-private.txt from edx-platform and move into configuration
 2018-01-19 16:54:18 +05:00
Awais Jibran
1114e4334a Merge pull request #17224 from edx/aj/staff-override-score-fix 
Fix staff override score
 2018-01-19 15:00:39 +05:00
Matthew Piatetsky
24e4f2fa63 Merge pull request #17244 from edx/try_bundling_test_fix 
Add some more data for debugging bundling test and try potential fix
 2018-01-18 23:52:08 -05:00
Matthew Piatetsky
0065e3c81e Add some more data for debugging bundling test and try potential fix 2018-01-18 18:03:14 -05:00
Matthew Piatetsky
a5b5a56b88 Merge pull request #17229 from edx/jaebradley/add_modal 
add modal
 2018-01-18 18:02:23 -05:00
Jeremy Bowman
bcc8ae6a78 Merge pull request #17187 from edx/jmbowman/PLAT-1831 
PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs
 2018-01-18 16:31:28 -05:00
Farhanah Sheets
053ca84c92 Merge pull request #17241 from edx/fsheets/EDUCATOR-2079 
SFE Version bump
 2018-01-18 15:57:18 -05:00
Albert (AJ) St. Aubin
dfe149b5ff Merge pull request #17234 from edx/aj/pagination_update_entitlements 
Increased the page size for the entitlements API
 2018-01-18 14:38:23 -05:00
Awais Jibran
0016d6284d Fix staff override score 
If a learner has not accessed/attempted the score override functionality
didn't work. This PR is intended to fix this behaviour and the
override should work regardless of learner has accessed or attempted
a problem or not.
 2018-01-19 00:15:34 +05:00
Robert Raposa
aaafa9cde9 Merge pull request #17235 from edx/robrap/LEARNER-3905-add-staff 
LEARNER-3905: Enable Learner Analytics for staff users.
 2018-01-18 14:03:10 -05:00
Matthew Piatetsky
ba9b15e10b Add modal to track selection and dashboard 
add waffle flag
 2018-01-18 13:52:26 -05:00
Calen Pennington
2d89f1b2ab Put Require.js in debug mode in acceptance tests, because they don't run with optimized assets 2018-01-18 13:49:44 -05:00
Calen Pennington
58bb7167c1 Convert cms login.html to the require_page pattern in preparation for webpack 2018-01-18 13:49:44 -05:00
Jeremy Bowman
8513945229 PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs 2018-01-18 13:44:34 -05:00
Nimisha Asthagiri
a5c5325a27 Merge pull request #17196 from edx/arch/plugin-signals-support 
Django App Plugins: support for Signal Receivers
 2018-01-18 13:23:18 -05:00
Farhanah Sheets
61ade535d2 SFE Version bump 2018-01-18 13:05:49 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Jae Bradley
905d258ca9 Merge pull request #17233 from edx/update-sfe-in-lock-file 
update package-lock file
 2018-01-18 12:25:47 -05:00
AlasdairSwan
b46ce3a414 Merge pull request #17214 from edx/alasdair/LEARNER-3429-learner-analytics-dashboard-styles 
LEARNER-3429 Learner Analytics Dashboard Style updates
 2018-01-18 12:01:24 -05:00
Nimisha Asthagiri
5430b3633f Move COURSE_START_DATE_CHANGED signal 2018-01-18 11:48:24 -05:00
Nimisha Asthagiri
2d28d2ce9e Update Schedules to use Plugin Signals 2018-01-18 11:48:24 -05:00
Douglas Hall
0a27d62ee0 Merge pull request #17236 from edx/douglashall/enterprise_0_62_0 
Upgrade edx-enterprise package to 0.62.0.
 2018-01-18 11:48:16 -05:00
Nimisha Asthagiri
1fe74c889c Django App Plugins: Support for Signal Receivers 2018-01-18 11:47:30 -05:00
Douglas Hall
72f1c413d9 Upgrade edx-enterprise package to 0.62.0. 2018-01-18 10:29:31 -05:00
Robert Raposa
121a2dda9e Enable Learner Analytics for staff users. 
LEARNER-3905
 2018-01-18 10:22:42 -05:00
Albert St. Aubin
e23def673b Increased the page size for the entitlements API 2018-01-18 10:19:55 -05:00
Calen Pennington
bacd4334ed Add a form of static:require_module that assumes that the factory is self-initializing 2018-01-18 10:10:30 -05:00
jaebradley
8736507ff6 update package-lock file 2018-01-18 09:52:52 -05:00
Saleem Latif
7858066776 Merge pull request #17230 from edx/saleem-latif/ENT-805-add-logging 
[ENT-805]: Add logging to better understanding why skip activation email is not working as expected.
 2018-01-18 19:41:36 +05:00
AlasdairSwan
9e92ba9845 LEARNER-3429 Learner Analytics Dashboard Style updates 2018-01-18 09:37:53 -05:00
Hasnain Naveed
3cf8aeab1f Merge pull request #17143 from edx/hasnain-naveed/WL-1395 
Changed the secret key for ecommerce and discovery clients.
 2018-01-18 15:25:00 +05:00
Douglas Hall
ffb01bb05e Merge pull request #17223 from edx/douglashall/ENT-851 
ENT-851 TPA Registry.get should return None if passed None.
 2018-01-18 04:54:29 -05:00
Saleem Latif
06b6c1c50d Add logging to better understanding why skip activation email is not working as expected. 2018-01-18 14:22:53 +05:00
Noraiz Anwar
9de58fa100 Merge pull request #17165 from edx/noraiz/EDUCATOR-1994 
auto certs for professional and no-id-professional enrollment modes
 2018-01-18 12:52:05 +05:00
Uzair Rasheed
74c8497b9b Merge pull request #17199 from edx/LEARNER-3812/dashboard-url 
Append dashboard url with slash to improve user experience
 2018-01-18 12:34:17 +05:00
noraiz-anwar
698a041ee8 auto certs for non-verfied enrollment modes 2018-01-18 11:43:16 +05:00
Matthew Piatetsky
92c6945fe2 Merge pull request #17226 from edx/debug_bundles_dashboard 
add additional info to dom for debugging purposes
 2018-01-17 17:59:52 -05:00
Tyler Hallada
57bcc55cdc Merge pull request #17207 from edx/thallada/fullpage-sfe 
EDUCATOR-2067 If SFE enabled, hide sidebar and upload button
 2018-01-17 17:32:58 -05:00
Matthew Piatetsky
76a4ddef57 add additional info to dom for debugging purposes 2018-01-17 16:03:59 -05:00
Ari Rizzitano
13f0e6a63a Merge pull request #17121 from edx/ari/frontend-docs 
first pass JS and Bootstrap docs
 2018-01-17 15:35:33 -05:00
Tyler Hallada
a0700a6484 Upgrade SFE to 0.8.3 2018-01-17 15:35:23 -05:00