Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,451 Commits 1 Branch 0 Tags
0b40c9045e8a96c33a0d3cedbddb2aa99fc06819
Commit Graph

52451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
0b40c9045e Add environment variables that coverage needs. 
These are used in the coveragerc to referr to equivalent paths for when
combining coverage files.
 2019-11-26 15:30:33 -05:00
Diana Huang
b074f0c671 Merge pull request #22380 from edx/diana/delete-old-logistration-templates 
ARCH-1312: Remove old login and registration templates.
 2019-11-26 14:16:57 -05:00
Ned Batchelder
30d4c37a30 Merge pull request #22091 from mahyard/activation-email-to-ace 
Activation email to ace
 2019-11-26 13:09:20 -05:00
Alex Dusenbery
6c754aaf9f upgrade ORA to 2.4.3 2019-11-26 11:07:31 -05:00
Feanil Patel
5b83234df4 Merge pull request #22402 from edx/jenkins/upgrade-python-requirements-d044ed2 
Python Requirements Update
 2019-11-26 09:32:00 -05:00
adeelehsan
b9fd7f24ce Merge pull request #22394 from edx/aehsan/prod-1004/added_uri_for_explore_new_programs 
Uri added for explore new program
 2019-11-26 18:36:26 +05:00
edX Transifex Bot
1348bf0eec fix(i18n): update translations 2019-11-26 08:12:52 -05:00
adeelehsan
c7172c1d69 Uri added for explore new program 
PROD-1004
 2019-11-26 17:28:45 +05:00
edX requirements bot
f0b78cf17b Updating Python Requirements 2019-11-26 05:49:14 -05:00
Alex Wang
d044ed28b5 Student can NOT modify membership status with team in instructor managed topic (#22286) 
* no student change to instructor managed team

* Address comments & fix unit tests

* fix jenkins test failure

* Fix eslint errors

* Fix xss warnings

* Fix bokchoy test
 2019-11-25 19:59:51 -05:00
Robert Raposa
2113f41b44 Merge pull request #22397 from edx/robrap/ARCH-1253-remove-login-ajax-error-url 
ARCH-1253: remove unused login ajax error url
 2019-11-25 17:36:19 -05:00
Robert Raposa
6086e37c28 Merge pull request #22379 from edx/robrap/ARCH-1253-login-post-clean-up 
ARCH-1253: switch login_user errors to 400
 2019-11-25 16:15:02 -05:00
edX cache uploader bot
d707899d68 Updating Bokchoy testing database cache (#22399) 2019-11-25 15:53:38 -05:00
Mahyar Damavand
4ff5d129c8 Fix issues with PR #18928 ... 
Fix celery task failure
Fix code quality test failures
Fix python test failures
Fix issue with PR #22042
Rebase and fix new test failures
 2019-11-25 23:56:10 +03:30
Shadi Naif
f93023bafe Convert Account Activation Emails to edx-ACE 2019-11-25 23:56:09 +03:30
Diana Huang
87e73a512a Merge pull request #22387 from edx/diana/move-password-reset-2 
Move password reset logic from student to user_authn.
 2019-11-25 14:55:28 -05:00
Diana Huang
f8c8bf36a6 Move password reset logic from student to user_authn. 2019-11-25 13:58:09 -05:00
Albert (AJ) St. Aubin
da17d3261a Merge pull request #22398 from edx/aj/ENT-2082_task 
Upgrading edx-enterprise
 2019-11-25 13:39:27 -05:00
Albert (AJ) St. Aubin
2400d895d9 Upgrading edx-enterprise 2019-11-25 12:43:37 -05:00
Robert Raposa
fc022a4510 remove unused login ajax error url 
ARCH-1253
 2019-11-25 11:22:28 -05:00
Ned Batchelder
6ccf0e6527 Merge pull request #22352 from overhangio/regisb/contributing-forum 
Use discussion forum as the primary conversation channel for the community
 2019-11-25 10:44:27 -05:00
David Ormsbee
3c8d3f31cc Merge pull request #19610 from appsembler/omar/reindex-course-staff 
Hide the re-index button for non-global staff
 2019-11-25 10:35:58 -05:00
Robert Raposa
5aa6181f85 switch login_user errors to 400 
The APIs using login_user are currently not following the API
conventions for non-SSO related authentication errors, by returning a
200 status code for errors.

In addition to switching the status code from 200 => 400 for
authentication failures, the following minor changes were made:
- Document and refactor an existing authn switch.
- Remove an unused url definition for login_ajax + error.

BREAKING CHANGE: This changes /login_post and /login_ajax to return
400, rather than 200, when success=False in the returned JSON (for
non-SSO related authentication errors).

To remove risk around this change, it was added behind a waffle switch
named `user_authn.update_login_user_error_status_code`.

A breaking change was made, rather than introducing /login_ajax_new,
in order to more quickly get to our end goal of the current clean-up
effort of having a single function for login. If this breaks any
callers, we may fix or abandon this change altogether.

ARCH-1253
 2019-11-25 09:53:43 -05:00
Omar Al-Ithawi
1e02748d65 Hide the re-index button for non-global staff 2019-11-25 17:49:46 +03:00
edX requirements bot
3caa4c3da1 Updating Python Requirements (#22390) 2019-11-25 08:15:50 -05:00
Zia Fazal
ec1825c755 Merge pull request #22345 from edx/ziafazal/ENT-1849-b 
ENT-1849: Removed EnterpriseMiddleware
 2019-11-25 17:22:40 +05:00
Syed Muhammad Dawoud Sheraz Ali
b54e223647 Merge pull request #22393 from edx/dsheraz/PROD-1026-workaround 
render content and log the error when getting sibling urls
 2019-11-25 15:29:04 +05:00
DawoudSheraz
40611acf87 render content and log the error when getting sibling urls 2019-11-25 14:55:45 +05:00
Syed Muhammad Dawoud Sheraz Ali
69243a682f Merge pull request #22349 from edx/dsheraz/PROD-996 
Update ORA2 version
 2019-11-25 13:15:15 +05:00
DawoudSheraz
821417a6f1 update ORA 2019-11-25 12:42:23 +05:00
Matthew Piatetsky
6d2ed9d876 Merge pull request #22389 from edx/try_to_fix_remove_discount_from_track_selection 
never give users discount unless they've seen the banner
 2019-11-22 16:31:39 -05:00
Matthew Piatetsky
51ea129267 never give users discount unless they've seen the banner 2019-11-22 15:54:59 -05:00
Awais Qureshi
7000b29d9a Merge pull request #22383 from edx/awais786/edx-when-upgrade 
BOM-1015.
 2019-11-22 21:35:30 +05:00
edX cache uploader bot
4330c0faae Updating Bokchoy testing database cache (#22382) 2019-11-22 11:31:28 -05:00
Ned Batchelder
7616fbed28 Merge pull request #22378 from edx/nedbat/update-coverage-plugin 
Update coverage versions for who-tests-what hacking
 2019-11-22 11:17:03 -05:00
Calen Pennington
89ef247f5d Merge pull request #22368 from luismorenolopera/dmo/INCR-561 
Convert @require_certificate_permission to use user.has_perm
 2019-11-22 11:06:05 -05:00
adeelehsan
d506ecc99f Merge pull request #22318 from edx/aehsan/prod-987/fixing_oom_issue_for_notify_credentials 
Fixing notify credentials job
 2019-11-22 20:54:56 +05:00
Zaman Afzal
9b82185323 Revert "ENT-2454 Modify third party auth pipeline to update user enterprise (#22314)" (#22384) 
This reverts commit 439e4b4169.
 2019-11-22 20:46:36 +05:00
Feanil Patel
bb75d2fffe Merge pull request #22381 from edx/jenkins/upgrade-python-requirements-df35dfd 
Python Requirements Update
 2019-11-22 09:57:25 -05:00
Diana Huang
754022f1af Remove old logistration templates. 2019-11-22 09:40:52 -05:00
Diana Huang
685260c721 Merge pull request #22366 from edx/diana/move-password-change-request 
Move request_password_change to user_authn.
 2019-11-22 09:40:13 -05:00
adeelehsan
e32e39e099 Fixing notify credentials job 
To save the memory get cert and grade object directly from
the db because by doing that we'll override the queryset
evaluation and object won't be cached once it has gone out
of scope.

PROD-987
 2019-11-22 18:38:00 +05:00
Awais Qureshi
9cad9e4101 BOM-1015. 
Bump the version
 2019-11-22 18:36:40 +05:00
Zaman Afzal
439e4b4169 ENT-2454 Modify third party auth pipeline to update user enterprise (#22314) 
* ENT-2454 Modify third party auth pipeline to update user enterprise
 2019-11-22 17:47:12 +05:00
Abdul Hannan
f77461e749 Merge pull request #22372 from edx/rename_start_in_schedule__1/4 
Add start_date field in Schedule model to replace start as it's reserved keyword.
 2019-11-22 17:28:57 +05:00
hunytalk
75b4b04607 Add start_date field in schedule model 2019-11-22 16:46:57 +05:00
edX requirements bot
27580133fc Updating Python Requirements 2019-11-22 05:48:09 -05:00
Albert (AJ) St. Aubin
df35dfd94c Merge pull request #22374 from edx/aj/ENT-2082_url 
Upgrade edx-enterprise to 2.0.24
 2019-11-21 14:55:45 -05:00
Ned Batchelder
e10651f753 Update coverage versions for who-tests-what hacking 
The coverage version shouldn't matter, but why not use the latest?

The plugin version fixes an encoding issue.
 2019-11-21 14:53:01 -05:00
Calen Pennington
5168904b8a Merge pull request #22377 from cpennington/fix-bok-choy-wtw-collection 
Remove the SHARD suffix for bokchoy coverage reports, because they ar…
 2019-11-21 14:10:56 -05:00