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

17941 Commits

Author SHA1 Message Date
bmedx
147663fb6e Update fix_ungraded_certs to Django 1.11 spec 2018-04-05 10:41:08 -04:00
hamzamunir7300
315c06c633 Merge pull request #17857 from edx/LEARNER-4858 
Border Appearing on wiki and Progress page.
 2018-04-04 18:48:42 +05:00
Attiya Ishaque
1a76384959 Merge pull request #17856 from edx/ai/EDUCATOR-2436-due-date-format 
Fix due date display format according to set in advanced settings.
 2018-04-04 11:13:52 +05:00
Hamza Munir
56b5417e13 Border Appearing on wiki and Progress page. 
A generic css rule like this ".container>div" is present on the wiki page.
Due to which these borders were showing around the footer on  those pages.
added a fix for that in this PR.

LEARNER-4858
 2018-04-03 17:32:33 +05:00
attiyaishaque
438ecceb01 Fix due date display format according to set in advanced settings. 2018-04-03 16:03:15 +05:00
bmedx
ada7ded553 Add an API endpoint for retiring a user from the cs_comments_service 2018-04-02 14:54:55 -04:00
Brian Mesick
4841ff7943 Merge pull request #17790 from edx/bmedx/user_retirement_utils 
Add some common functionality for retiring users
 2018-04-02 14:41:52 -04:00
Diana Huang
fd733a9611 Merge pull request #17800 from edx/diana/update-registration 
LEARNER-4403: Update TOS and Privacy Policy field on registration form for GDPR.
 2018-04-02 14:01:23 -04:00
bmedx
b26d7913f5 Add some common functionality for retiring users 
- Methods for getting hashed retired users and usernames
- A DRF permission for retiring users
 2018-04-02 13:48:52 -04:00
Douglas Hall
7b65a76d33 Reverting celery task kwarg name. 2018-04-02 12:40:03 -04:00
Jeremy Bowman
d622380cc5 Account for Django block on DDL in transactions 2018-04-02 11:47:54 -04:00
Diana Huang
6ceb7e1500 Update TOS and Privacy Policy field on registration from for GDPR. 2018-04-02 10:01:18 -04:00
Brian Mesick
59c65c9daf Merge pull request #17843 from edx/bmedx/fix_cert_whitelist 
Remove deprecated make_option from certificates management commands
 2018-04-02 08:59:07 -04:00
bmedx
9bde305c49 Remove deprecated make_option from certificates management commands 2018-03-30 15:54:35 -04:00
Matthew Piatetsky
b2ebacf4c6 Merge pull request #17787 from edx/REV-19 
fix REV-19 experiment check for refunds
 2018-03-30 14:28:01 -04:00
Matthew Piatetsky
063118cf0e fix REV-19 experiment check for refunds 2018-03-30 13:28:43 -04:00
edx-pipeline-bot
70ae23d4c2 Merge pull request #17831 from edx/release-mergeback-to-master 
Merge release back to master
 2018-03-29 13:58:22 -04:00
Matthew Piatetsky
81ba82b5f1 Merge pull request #17823 from edx/REV-56 
Add chapter index to dom
 2018-03-29 12:16:02 -04:00
Waheed Ahmed
5a47cecb9b Merge pull request #17828 from edx/waheed/LEARNER-4801-route-sailthru-tasks-to-lms-ace-queue 
Route sailthru tasks to lms ace queue instead of default.
 2018-03-29 20:47:47 +05:00
Matthew Piatetsky
734e385030 Add chapter index to dom 2018-03-29 11:07:15 -04:00
sanfordstudent
028ad2ebd4 Merge pull request #17743 from edx/sstudent/EDUCATOR-2444 
Show inline discussions by default
 2018-03-29 09:26:12 -04:00
Waheed Ahmed
8eb73a6e17 Route sailthru tasks to lms ace queue instead of default. 
LEARNER-4801
 2018-03-29 14:39:03 +05:00
Douglas Hall
82038870aa Merge pull request #17808 from edx/douglashall/ENT-936 
ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration.
 2018-03-28 15:39:15 -04:00
Sanford Student
0bfe9c8d94 remove showbydefault 2018-03-28 15:33:52 -04:00
Ned Batchelder
465427f454 Merge pull request #16297 from open-craft/cornwell/content-of-static-pages 
Ability to set content of static pages via Site Configuration
 2018-03-28 14:28:19 -04:00
Douglas Hall
2ecbe19b29 ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration. 2018-03-28 14:00:35 -04:00
Alex Dusenbery
26ba411eb0 EDUCATOR-2535 | Small style cleanup for course outline. 2018-03-28 10:42:20 -04:00
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Troy Sankey
81ed96bc88 bump django to 1.11.11 2018-03-27 15:55:07 -04:00
hamzamunir7300
e30e12e83d Merge pull request #17797 from edx/LEARNER-4766 
Footer Chinese Language Dupluication Issue
 2018-03-27 19:34:03 +05:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue 
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
 2018-03-27 19:19:37 +05:00
Ahsan Ulhaq
ea9a679c27 small nit 2018-03-27 16:59:07 +05:00
Ahsan Ulhaq
7428b2fe94 Discovery for pdf cert generation 
LEARNER-4520
 2018-03-27 15:23:46 +05:00
Nimisha Asthagiri
e5b9452e76 Merge pull request #17385 from mitodl/hack18_instructor_django_plugin 
Changed 'instructor' django app to follow plugin pattern
 2018-03-26 15:20:47 -06:00
Brittney Exline
1b4ac84141 Merge pull request #17788 from edx/bexline/verify_student_cleanup 
ENT-934 Remove deprecated models in verify_student
 2018-03-26 13:51:35 -06:00
Troy Sankey
fe9990608d Merge pull request #17782 from edx/pwnage101/improve-old-banner-appearance 
move global status messages to the user notificatio area
 2018-03-26 14:58:54 -04:00
Brittney Exline
956b627501 ENT-934 Remove deprecated models in verify_student 
These models say they are to be fully removed in Hawthorn, so let's make it happen!
 2018-03-26 14:48:34 -04:00
Michael LoTurco
a3fdf8827d Merge pull request #17785 from edx/MLoTurco/learner-3925-support-link 
Adds entitlement tool to support tool home
 2018-03-26 13:44:43 -04:00
Michael LoTurco
537b6652c2 adds entitlment tool to support tool home 2018-03-26 12:53:22 -04:00
Troy Sankey
b1ce012a94 move global status messages from the header to the user notification area 2018-03-26 12:06:29 -04:00
Eric Fischer
b35d227cc3 Merge pull request #17760 from edx/efischer/EDU-499 
Remove PRUNE_OLD_VERSIONS waffle flag
 2018-03-26 11:59:31 -04:00
Gavin Sidebottom
7626d4abf0 Changed 'instructor' django app to follow plugin pattern 2018-03-26 10:44:41 -04:00
Albert (AJ) St. Aubin
7c6c2a1664 Merge pull request #16757 from appsembler/omar/search-for-courses-api 
Add search for courses API to allow building a mobile native search view
 2018-03-26 07:31:36 -04:00
Mike
0e2b667bb4 Added ability to change header and content of static pages in two ways. 
1. Using the pageheader and pagecontent block names.
2. Setting SiteConfiguration settings for each individual html page.

Co-authored by: Tomasz Gargas <tomasz@opencraft.com>
 2018-03-24 21:37:09 +01:00
Michael LoTurco
4c2eab4100 Merge pull request #17756 from edx/MLoTurco/learner-3925-div-form 
add entitlement creation and reissue to support
 2018-03-23 18:26:18 -04:00
Alex Dusenbery
10be8bcd4e add entitlement support creation and reissue 
Learner-3925
 2018-03-23 17:10:46 -04:00
Troy Sankey
9f30a75a08 add missing maintenance banner settings 2018-03-23 16:34:47 -04:00
Eric Fischer
242ac4c9cd Remove PRUNE_OLD_VERSIONS waffle flag 2018-03-23 12:41:08 -04:00
Eric Fischer
97151ae4f4 Merge pull request #17761 from edx/efischer/EDUCATOR-2456 
Delete some unused settings
 2018-03-23 11:21:12 -04:00
McKenzie Welter
fa90d6e651 Merge pull request #17640 from edx/McKenzieW/learner-4400 
Move support actions to existing entitlement api
 2018-03-23 10:37:52 -04:00