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

45629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
398700a1af Merge pull request #17863 from edx/dahlia/sfe-1.6.3 
studio-frontend 1.6.3
 2018-04-03 16:43:09 -04:00
Eric Fischer
9c820a04a3 studio-frontend 1.6.3 2018-04-03 14:39:39 -04:00
Brian Mesick
503b2ff0b1 Merge pull request #17818 from edx/bmedx/lms_forums_retire_api 
Create API endpoint to retire cs_comments_service users
 2018-04-03 13:53:57 -04:00
J Eskew
fa8b05a6c7 Merge pull request #17861 from edx/jeskew/django_1_11_12_upgrade 
Upgrade Django to 1.11.12
 2018-04-03 12:19:50 -04:00
John Eskew
bbe25a066b Upgrade Django to 1.11.12 2018-04-03 11:24:21 -04:00
Michael Youngstrom
1bfad94245 Merge pull request #17852 from edx/youngstrom/bump-bokchoy 
Bump bok-choy to v0.7.2
 2018-04-03 11:16:05 -04: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
Brian Beggs
161bf6943d Merge pull request #17850 from mitodl/fix_aq_no_name_notmigrations 
Fixed error: ImportError: No module named notmigrations
 2018-04-02 14:07:26 -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
9e9299aaed Merge pull request #17855 from edx/douglashall/revert_celery_task_kwarg_name 
Reverting celery task kwarg name.
 2018-04-02 13:26:36 -04:00
Douglas Hall
7b65a76d33 Reverting celery task kwarg name. 2018-04-02 12:40:03 -04:00
Jeremy Bowman
d7a4ef2f44 Merge pull request #17842 from edx/fix_ddl_in_mysql_transactions 
Account for Django block on DDL in transactions
 2018-04-02 11:49:48 -04:00
Jeremy Bowman
d622380cc5 Account for Django block on DDL in transactions 2018-04-02 11:47:54 -04:00
Michael Youngstrom
60c1f37243 Bump bok-choy to v0.7.2 2018-04-02 10:57:07 -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
Amir Qayyum Khan
b6c6535f15 Fixed error: ImportError: No module named notmigrations 2018-04-02 17:44:59 +05:00
edX Transifex Bot
a8a3c5f322 Update translations 2018-04-01 17:27:42 -04:00
Alex Dusenbery
1cbf7ab0fb EDUCATOR-1290 | Remove over-limit block keys randomly for library content blocks. 2018-03-31 13:43:11 -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
Albert (AJ) St. Aubin
13e7ec6aa5 Merge pull request #17804 from edx/aj/LEARNER-4493 
Aj/learner 4493
 2018-03-30 12:24:31 -04:00
McKenzie Welter
06c71694a6 Merge pull request #17836 from edx/McKenzieW/learner-4095 
allow site and mode to be nullable in admin form
 2018-03-30 11:13:27 -04:00
McKenzie Welter
2762a6114b allow site and mode to be nullable in admin form 2018-03-30 10:24:31 -04:00
Albert (AJ) St. Aubin
545c86a0a7 Merge pull request #17829 from edx/aj/LEARNER-4567 
Protection for when there is no CourseOverview data available.
 2018-03-30 07:30:22 -04:00
Troy Sankey
965cf0c8e6 Merge pull request #17832 from edx/pwnage101/reorder-third_party_auth-0017 
reorder 0017_auto_20180327_1631 to be after the other 0017
 2018-03-29 14:44:28 -04:00
Troy Sankey
2e05eeca54 reorder 0017_auto_20180327_1631 to be after the other 0017 
The migration 0017_remove_icon_class_image_secondary_fields was in
conflict with 0017_auto_20180327_1631, so we bump the latter to 0018.
 2018-03-29 14:35:55 -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
Albert St. Aubin
1d9b3842ef Corrects issue with Entitlement Auto upgrade and Soft Upgrade deadline 
issues

[LEARNER-4493]
 2018-03-29 12:27:28 -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
Alex Dusenbery
60d71ce581 EDUCATOR-2553 | Bump edx-completion to 0.1.4; Add feature-gating tests for completion. 2018-03-29 12:08:33 -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
Albert St. Aubin
35324a7314 Moved to a try catch block 2018-03-29 10:35:43 -04:00
Bill Filler
206f73d095 Merge pull request #17812 from edx/ibrahimahmed443/WL-1491 
Ibrahimahmed443/wl 1491
 2018-03-29 09:34:16 -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
Albert St. Aubin
e8a3077bfa Protection for when there is no CourseOverview data available. 2018-03-29 07:10:58 -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
Awais Jibran
5ac5d9d532 Merge pull request #17796 from edx/aj/COURSE_LOADING_ERROR 
Logging: Error getting the course from modulestore
 2018-03-29 13:09:39 +05:00
Awais Jibran
52f66a8d9d Merge pull request #17795 from edx/aj/use-get-or-create-EDUCATOR-2549 
Use get or create rather than create
 2018-03-29 13:08:53 +05:00
Michael Roytman
c9c97e58c5 Merge pull request #17700 from edx/mroytman/studio-link-to-lms 
Link to LMS from Studio footer
 2018-03-28 16:14:28 -04: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
Troy Sankey
593710e7cb Merge pull request #17806 from edx/pwnage101/bump-django-to-1.11 
bump django to 1.11
 2018-03-28 14:50:39 -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
Michael Roytman
a0ed8fa38d Add a link to the LMS from Studio footer. 2018-03-28 14:10:30 -04:00
McKenzie Welter
a3521b9ce1 Merge pull request #17758 from edx/McKenzieW/learner-4095 
Enable mode-specific course entitlement policy
 2018-03-28 14:04:40 -04:00