Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,230 Commits 1 Branch 0 Tags
38244fefbfc906fdfcb673e5813ea5eb95dedbbb
Commit Graph

16812 Commits

Author SHA1 Message Date
Nimisha Asthagiri
aaa7b20654 Merge pull request #20126 from edx/depr/mobile-video-outline-api 
DEPR-4: Remove Mobile Video Outlines API
 2019-04-12 08:37:17 -04:00
Waheed Ahmed
159685b2b2 Fix Facebook and Google social auth buttons. 
Facebook emailed that edX doesn't comply with Platform Policy 8.3, also fixed
Google button according to their policy.

PROD-174
 2019-04-11 17:25:06 +05:00
Thomas Tracy
29fb1588a9 Another pip issue. 2019-04-10 09:02:50 -04:00
Thomas Tracy
f59dc6c820 Fix's bug that does not allow an Oauth2 provider to have different slug and backend_names 
Added comment to explain model change.

Removed accidental whitespace.

Another pip issue.
 2019-04-09 19:59:55 -04:00
edX cache uploader bot
b54bd1cae3 Bokchoy db cache update (#20199) 
* Updating migrations for new waffle switch: enterprise_role_based_access_control
 2019-04-09 16:16:46 -04:00
edx-cache-uploader-bot
ca3fb17406 Updating migrations 2019-04-08 10:56:30 -04:00
Alan Zarembok
1311100b29 Merge pull request #20173 from edx/azarembok/fix-video-rewrite-2 
PROD-101: Do not rewrite URL for videos that do not have a video id.
 2019-04-05 16:17:31 -04:00
Alex Dusenbery
d134a435d5 Add get_queryset method to CourseModesView; cleanup tests again 2019-04-05 16:12:35 -04:00
Alan Zarembok
f9a5d93ce4 PROD-101: Do not rewrite URL for videos that do not have a video id. 2019-04-05 15:29:17 -04:00
Michael Youngstrom
68ab69a46b Merge pull request #20162 from jolyonb/incr-200 
INCR-200 Migrate common/djangoapps/util/tests and migrations
 2019-04-05 14:04:08 -04:00
Hasnain Naveed
6acf53173f Merge pull request #20048 from edx/hasnain-naveed/WL-1903 
WL-1903 | Error handling for incorrect configuration of SAML Auth.
 2019-04-05 15:55:03 +05:00
Jolyon Bloomfield
8adaca66d1 INCR-200 Migrate common/djangoapps/util/tests and migrations 2019-04-05 00:57:46 -04:00
Alex Dusenbery
cddf32560d Cleanup after tests. 2019-04-04 20:27:27 -04:00
Jolyon Bloomfield
b8e1478ff0 INCR-126 Modernize common/djangoapps/student/management/tests (#20151) 2019-04-04 10:08:02 -04:00
Jolyon Bloomfield
26351509ee INCR-196 Migrating common/djanjoapps/student/signals and views (#20138) 2019-04-03 15:16:55 -04:00
Alex Dusenbery
eff3a07005 Add a course_modes REST API. 2019-04-03 14:44:00 -04:00
Jolyon Bloomfield
27e1d28ed2 INCR-185 Modernize common/lib/xmodule/xmodule/assetstore and contentstore (#20124) 
* INCR-185 Modernize common/lib/xmodule/xmodule/assetstore and contentstore

* Adding check for python version when making integer contracts
 2019-04-02 19:56:28 -04:00
Nimisha Asthagiri
3d8b8a05ad DEPR-4: Remove Mobile Video Outlines API 2019-04-02 17:28:26 -04:00
Bessie Steinberg
243738f828 ENT-1334: Fix: SSO users last_login set to NULL 
- The very first time a user signed in through SSO their ```last_login```
  field on the ```auth_user``` table was set to NULL instead of the
  appropriate time stamp.  This fixes that issue.
 2019-04-02 14:40:55 -04:00
Michael Youngstrom
d62b393c58 Merge pull request #20125 from edx/youngstrom/INCR-128 
INCR-128
 2019-04-02 14:18:24 -04:00
Douglas Hall
c8c365041b Merge pull request #20111 from edx/douglashall/ARCH-607 
ARCH-607 Add API view for retrieving third party auth user status.
 2019-04-02 13:40:13 -04:00
Douglas Hall
7128059921 Add API view for retrieving third party auth user status. 2019-04-02 12:58:13 -04:00
Michael Youngstrom
9d589f997d INCR-128 2019-04-02 12:40:26 -04:00
Michael Youngstrom
746b5a7e8d Merge pull request #20119 from edx/testeng/bokchoy_auto_cache_update_f2440cac82cfce5547d42c8bf9504468bee4a743 
Bokchoy db cache update
 2019-04-02 12:21:02 -04:00
edx-cache-uploader-bot
db6de5990d Updating migrations 2019-04-02 10:32:26 -04:00
Christie Rice
bfce40663e Merge pull request #20110 from edx/crice/flakyTest 
Remove flaky test test_birth_year_not_set
 2019-04-02 09:27:29 -04:00
Jeremy Bowman
95986c4f9a Merge pull request #20116 from jolyonb/incr-162 
INCR-156 Migrated and cleaned up imports on /common/lib/capa/capa/tests/
 2019-04-01 20:25:05 -04:00
David Ormsbee
810b8b60f8 Merge pull request #19618 from open-craft/josuebc/upstream/BB-755 
BB-755 Add feature to manually unlock a student account after too many login attempts.
 2019-04-01 17:42:19 -04:00
Jolyon Bloomfield
932a76c958 INCR-162 Migrated and cleaned up imports on /common/lib/capa/capa/tests/ 2019-04-01 15:53:08 -04:00
Michael Youngstrom
59967d3ee6 Merge pull request #20083 from edx/testeng/bokchoy_auto_cache_update_a2cbb5d4d1ee2ee817aa59048db11123951b4805 
Bokchoy db cache update
 2019-04-01 12:31:39 -04:00
Christie Rice
349bc33ac0 Remove flaky test test_birth_year_not_set 2019-04-01 09:32:37 -04:00
Christie Rice
5462474aa6 Merge pull request #20072 from edx/crice/REVEM-203_dashboard 
REVEM-203 Add course and program info to dashboard metadata
 2019-04-01 09:16:53 -04:00
Christie Rice
052683f926 REVEM-203 Add course and program info to dashboard metadata 2019-03-30 08:30:07 -04:00
Stu Young
ad0e0da2db Merge pull request #20102 from jolyonb/incr-127 
INCR-127: Migrating common/djangoapps/course_action_state
 2019-03-29 17:04:38 -04:00
Jolyon Bloomfield
f7cb9641dd Migrating common/djangoapps/course_action_state 2019-03-29 12:42:28 -07:00
edx-cache-uploader-bot
d77b317273 Updating migrations 2019-03-29 12:31:00 -04:00
Matthew Piatetsky
4966b30bb5 Merge pull request #20071 from edx/revert-20064-revert-20003-mobile-access-denied 
continue removing blocks from course outline
 2019-03-29 11:20:59 -04:00
Matthew Piatetsky
1f6cd7aa5a Revert "Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason"" 2019-03-28 14:44:05 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Matthew Piatetsky
8eae694566 Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason" 2019-03-27 16:30:37 -04:00
Thomas Tracy
d71d1dd454 Merge pull request #20011 from edx/ttracy/ENT-1584-tracking-for-email-change 
Ttracy/ent 1584 tracking for email change
 2019-03-27 09:26:45 -04:00
Matthew Piatetsky
e6b55ede3d Merge pull request #20003 from edx/mobile-access-denied 
REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason
 2019-03-26 17:33:57 -04:00
Matthew Piatetsky
4bb539c9aa update user partition and access_denied_message_filter transformers 2019-03-26 15:26:59 -04:00
Thomas Tracy
1f8a9f5dc7 Added a tracking event for when the user switches their secondary email to their primary. 2019-03-26 13:41:34 -04:00
hasnain-naveed
c554ef6dd9 WL-1903 | Error handling for incorrect configuration of saml Auth. 2019-03-26 15:40:58 +05:00
Albert (AJ) St. Aubin
49dc2f0a81 Merge pull request #20049 from edx/aj/entitlement_expiration 
Aj/entitlement expiration
 2019-03-25 11:08:29 -04:00
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04:00
Michael Youngstrom
9c074eac86 Fix testing db 2019-03-22 16:59:57 -04:00
Josue Balandrano Coronel
78f4ccb50a Expose LoginFailure model to Django's Admin UI to allow admin users 
unlock student accounts that have been locked out for excessive login
failures. This change will allow to quickly unlock student accounts when
time is of the essence (e.g. Timed exams).
 2019-03-22 10:22:01 -05:00
Jeremy Bowman
4af18655e0 Merge pull request #20039 from edx/jmbowman/TE-2886 
TE-2886 Upgrade math/science packages in LMS and Studio
 2019-03-22 11:14:05 -04:00