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

45648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
147663fb6e Update fix_ungraded_certs to Django 1.11 spec 2018-04-05 10:41:08 -04:00
Stu Young
50744e0aac Merge pull request #17876 from edx/testeng/bokchoy_auto_cache_update_cffbf0280304e9c331e8ea1fe87f020ea6a3a329 
Bokchoy db cache update
 2018-04-04 14:53:34 -05:00
Brian Mesick
e71cfb2813 Merge pull request #17879 from edx/bmedx/remove_default_site_from_attributes 
Exclude the default site from UserAttribute 'created_on_site'
 2018-04-04 15:46:58 -04:00
bmedx
88153b7ac2 Exclude the default site from UserAttribute 'created_on_site' 
This table is getting slammed and causing deadlocks, since 90% of it
is just this one setting on the default site we're going to stop saving
those and make it a default assumption going forward.
 2018-04-04 15:00:59 -04:00
edx-cache-uploader-bot
62d8ae5cc2 Updating migrations 2018-04-04 13:42:03 -05:00
Douglas Hall
eb00772071 Merge pull request #17875 from edx/douglashall/ENT-952 
Upgrade edx-enterprise package to 0.67.1.
 2018-04-04 13:32:38 -04:00
Michael Youngstrom
382f8200be Merge pull request #17862 from edx/testeng/bokchoy_auto_cache_update_6e2e48398da9f11a3fe7ac599d6110034865b901 
Bokchoy db cache update
 2018-04-04 11:39:42 -04:00
Awais Jibran
02973250ea Merge pull request #17872 from edx/revert-17796-aj/COURSE_LOADING_ERROR 
Revert "Logging: Error getting the course from modulestore"
 2018-04-04 19:14:06 +05: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
Douglas Hall
d238a2de96 Upgrade edx-enterprise package to 0.67.1. 
https://github.com/edx/edx-enterprise/compare/0.67.0...0.67.1
 2018-04-04 09:17:20 -04:00
Awais Jibran
03f5aceda5 Merge pull request #17871 from edx/revert-17795-aj/use-get-or-create-EDUCATOR-2549 
Revert "Use get or create rather than create"
 2018-04-04 18:07:12 +05:00
Waheed Ahmed
80efe99df4 Merge pull request #17869 from edx/waheed/LEARNER-1220-fix-enabling-debug-allows-api-access-without-authentication 
Fix enabling debug allows api access without authentication.
 2018-04-04 16:50:04 +05:00
Awais Jibran
e12120befe Revert "Logging: Error getting the course from modulestore" 2018-04-04 16:46:29 +05:00
Awais Jibran
52fba9840a Revert "Use get or create rather than create" 2018-04-04 16:44:12 +05:00
Waheed Ahmed
20e7a15ac6 Fix enabling debug allows api access without authentication. 
LEARNER-1220
 2018-04-04 12:54:52 +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
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
edx-cache-uploader-bot
c420603913 Updating migrations 2018-04-03 13:24:54 -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
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
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