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

19803 Commits

Author SHA1 Message Date
bradmerlin
ab011314ef Add student_view_data to HTML XBlock 
to allow the HTML to be downloadable via the Course Blocks API.

Feature flag ENABLE_HTML_XBLOCK_STUDENT_VIEW_DATA must be set to enable this feature.
 2017-11-01 13:38:54 +10:30
Eric Fischer
783dba1c75 Merge pull request #16358 from edx/dahlia/EDU-1529 
Pass contextual data to studio-frontend
 2017-10-31 17:31:59 -04:00
Eric Fischer
27258425d2 Send contextual data through to studio-frontend 
EDUCATOR-1529
 2017-10-31 16:04:02 -04:00
Bill Filler
f9f4876bee Add 'View Consent' button to dashboard when required 
Enterprise customers can require user to agree to Data Sharing Consent
form before they can access a course. We now add it conditionally to
Course Dashboard when it's required so it's apparent to user and they
have a way to revist the consent form if they've previously declined or
the course has not yet started.

WL-1281
 2017-10-31 15:40:02 -04:00
John Eskew
e2060b60c3 Move signal registering to AppConfig's ready from startup.py 2017-10-31 14:25:27 -04:00
John Eskew
43150a1d23 GMT -> UTC in test 2017-10-31 12:55:28 -04:00
Saleem Latif
896da1020b Activation email received when skip_email_verification flag is 'True' 2017-10-30 14:13:42 +05:00
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets 
LEARNER-2977

Fixes
 2017-10-29 22:22:08 -04:00
Brian Beggs
3608b86273 Merge pull request #16309 from edx/bbeggs/PLAT-1411 
Replace SubfieldBase functionality PLAT-1411
 2017-10-27 10:41:32 -04:00
M. Rehan
f04594b8f6 Merge pull request #16290 from edx/mrehan/exlude-bumper 
Exclude bumper from VAL handling the transcripts
 2017-10-27 17:37:27 +05:00
Noraiz Anwar
19f9cb15a5 Merge pull request #16353 from edx/noraiz/add-logs-EDUCATOR-1424 
add logs to better understand course listing response time
 2017-10-27 17:19:34 +05:00
Awais Jibran
4b4e4f2698 Merge pull request #16319 from edx/aj/fix-capa-show-answer 
Fix Show Answer button display for the value "Answered" in studio
 2017-10-27 14:30:13 +05:00
noraiz-anwar
6cda1b2e0a add logs to better understand course listing response time 2017-10-27 12:49:15 +05:00
Brian Beggs
ca92ffe21d Remove SubfieldBase metaclass 2017-10-26 16:59:51 -04:00
Eric Fischer
3fc342e6e8 Webpack config prod/dev split 
EDUCATOR-1448

Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
 2017-10-26 14:03:53 -04:00
Harry Rein
7091ed0f70 Merge pull request #16337 from edx/HarryRein/home-page-styling-fixes 
Course home page styling with bootstrap.
 2017-10-26 13:39:44 -04:00
Tyler Hallada
52897d5808 Merge pull request #16346 from edx/thallada/ret-org-opt-out 
Org-level schedule upgrade deadline opt-out
 2017-10-26 13:31:21 -04:00
Harry Rein
d4e93fc655 Course home page styling with bootstrap. 
Updates the new bootstrap course home page to match the old course home page.
 2017-10-26 09:25:58 -04:00
Qubad786
4aef8d1c7b exclude bumper 2017-10-26 16:28:25 +05:00
Awais Jibran
fe5a8de55c Fixing quality 2017-10-26 16:19:10 +05:00
Awais Jibran
a428c08168 Fix Show Answer button display for the value "Answered" in studio 
In docs it is explained that we should show "Show Answer" button for "Answered" value when the user has correctly submitted the answer. The current behavior is such, even if the learner has answered the question wrong, the "Show Answer" button would be available.

EDUCATOR-1563
 2017-10-26 12:35:30 +05:00
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Matthew Piatetsky
2cb2e5e3eb Merge pull request #16344 from edx/LEARNER-2412 
Fix request to currency endpoint
 2017-10-25 16:41:45 -04:00
Matthew Piatetsky
e1c24084e9 Fix request to currency endpoint 2017-10-25 15:38:10 -04:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Hasnain
2277aaca3f WL-1060 | Made the dashboard social sharing site aware. 2017-10-24 16:35:44 +05:00
Ned Batchelder
5949024479 Merge pull request #16193 from open-craft/josh/fix-vimeo-m3u8-urls 
Fix regex in video xmodule to check for HTML5 video urls which contain parameters
 2017-10-23 14:23:06 -04:00
Sanford Student
fd8a9fdb02 EDUCATOR-1511: credit users added to verified user partition irrespective of upgrade deadline 2017-10-23 13:14:47 -04:00
Jillian Vogel
1b63bd9cd7 Merge pull request #16155 from open-craft/jill/enable_enterprise_integration 
Lets ENABLE_ENTERPRISE_INTEGRATION be configurable
 2017-10-23 20:09:43 +10:30
Harry Rein
160dba9505 Merge pull request #16210 from edx/HarryRein/responsive-header 
Adding a responsive, unified header to the LMS.
 2017-10-20 17:12:00 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
edx-pipeline-bot
d8620c952a Merge pull request #16296 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-20 14:52:24 -04:00
John Eskew
ce37e6d77e Merge pull request #16286 from edx/jeskew/move_third_party_auth_startup_code 
Move third_party_auth settings code to ready method.
 2017-10-20 11:45:37 -04:00
Eric Fischer
b541dfa3fd Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging" 
This reverts commit a13595352f, reversing
changes made to 68d5fe8922.
 2017-10-20 10:45:40 -04:00
Stu Young
c27c39301d Merge pull request #16257 from edx/estute/update-bokchoy-dbs 
update bokchoy dbs after migrations
 2017-10-20 09:41:00 -04:00
Nimisha Asthagiri
41862cf163 Merge pull request #16035 from proversity-org/proverity/NVN-enrollment-search-instructor-dashboard-fix 
FIX: course enrollment search, FIX: hidden tabs on instructor dashboard
 2017-10-19 17:50:06 -04:00
Andy Armstrong
e2612bdccf Merge pull request #16249 from edx/andya/responsive-discussions 
Make the discussion board responsive
 2017-10-19 17:09:47 -04:00
John Eskew
a6757e47a4 Move third_party_auth settings code to ready method. 2017-10-19 16:17:31 -04:00
Andy Armstrong
b85b7dad72 Disable Bok Choy tests that are failing on Jenkins 2017-10-19 16:15:21 -04:00
Stuart Young
a9ea168ce9 update bokchoy dbs after migrations 2017-10-19 15:01:13 -04:00
Sven Marnach
b754ad59ca Unconditionally include the wrapper div for the visibility message. 2017-10-19 14:24:58 -04:00
Sven Marnach
4837b6eb65 Link "Topic Area" dropdown to the visibility message via aria-describedby. 2017-10-19 14:24:58 -04:00
Douglas Cerna
49a13216a4 Fixed JS tests 2017-10-19 14:24:58 -04:00
Douglas Cerna
68714d9e97 Fixed quality errors 2017-10-19 14:24:58 -04:00