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

52480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Walladge
e6fe07c1fc Merge remote-tracking branch 'origin/master' into samuel/custom-search-filter 2019-12-04 14:17:43 +10:30
syedimranhassan
8fc357bb2e Merge pull request #22280 from edx/ihassan/OPS-4397_added_devstack_yml_file 
Added devstack config yml file to app repo
 2019-12-03 22:42:22 +05:00
syedimranhassan
f8f1edf4d8 Added devstack config yml file to app repo 2019-12-03 22:07:51 +05:00
Diana Huang
43354f86ae Merge pull request #22415 from edx/diana/move-account-creation-form 
Move AccountCreationForm to user_authn.
 2019-12-03 11:49:38 -05:00
Syed Muhammad Dawoud Sheraz Ali
0e6be31f08 Merge pull request #22428 from edx/dsheraz/PROD-1050 
ora version bump
 2019-12-03 14:58:28 +05:00
DawoudSheraz
ec044a604c ora version bump 2019-12-03 10:28:10 +05:00
Diana Huang
54be35f913 Move AccountCreationForm to user_authn. 2019-12-02 17:20:23 -05:00
Kyle McCormick
dcf5d70bc4 Create UI for CSV team management (#22310) 
Adds "Manage" sub-tab to course "Teams" tab
with UI for downloading and uploading team
membership CSVs. The upload and download function-
ality are currently not implemented.

The new tab only appears when the user is course staff
and the course has at least one instructor-managed
team-set, which is not the case for any existing
courses, so not current course staff will see this
change.

This ticket will be followed-up upon in MST-44 and
MST-49.

MST-41
 2019-12-02 11:27:05 -05:00
Michael Terry
c1f7b35483 Merge pull request #22407 from edx/mikix/verified-only 
Support courses with only a verified mode
 2019-12-02 09:25:39 -05:00
Awais Qureshi
4a932718f1 Merge pull request #22418 from edx/awais786/django-pyfs-bump-ver 
BOM-1028
 2019-11-28 16:17:52 +05:00
Waheed Ahmed
69b86af171 Merge pull request #22420 from edx/geoip2-bot-update-country-database2019-11-27 
geoip2: update maxmind geolite country database
 2019-11-28 13:05:18 +05:00
edX Transifex Bot
7c94dab10d geoip2: update maxmind geolite country database 2019-11-27 20:33:15 +00:00
Awais Qureshi
ca746885a2 BOM-1028 
Bump the versio
 2019-11-28 01:31:03 +05:00
Feanil Patel
6d7f5cb272 Merge pull request #22414 from edx/feanil/remove_flaky_test 
Remove this test because it is flaky.
 2019-11-27 11:02:56 -05:00
Zia Fazal
bbaabdb5dd Merge pull request #22413 from edx/revert-22345-ziafazal/ENT-1849-b 
Revert "ENT-1849: Removed EnterpriseMiddleware"
 2019-11-27 20:23:42 +05:00
Feanil Patel
ca2c24a058 Remove this test because it is flaky. 
It failed and passed on the same commit.  The failure was that the page
timed out, so it could be fixed by making that page performant.  I'd
rather not increase the timeout for the page to load as the bokchoy
tests are already very slow.

I'm also not sure why this test needs to exist.  I would think that this
could be tested on the underlying function without testing at the UI
layer.
 2019-11-27 10:19:38 -05:00
Feanil Patel
2faa45a2d1 Merge pull request #22409 from edx/feanil/update_tox_config 
BOM-1075 - Fix coverage reporting for python3 unit tests.
 2019-11-27 10:14:18 -05:00
Zia Fazal
052035bcfd Revert "ENT-1849: Removed EnterpriseMiddleware" 2019-11-27 19:26:07 +05:00
Saad Yousaf
0186f5e175 Merge pull request #22344 from edx/saad/PROD-736 
[PROD-736] Course outline links incorrect in subsections with staff-only units
 2019-11-27 16:41:20 +05:00
saadyousafarbi
a59363432c handle section link bug for staff-only units for learners. 2019-11-27 15:52:39 +05:00
Zaman Afzal
0497646ad9 bump edx-enterprise version to 2.0.27 (#22410) 2019-11-27 14:16:37 +05:00
Syed Muhammad Dawoud Sheraz Ali
af976b754d Merge pull request #22404 from edx/dsheraz/PROD-964 
conditional logs to find the inconsistent block id in MITx course
 2019-11-27 13:05:59 +05:00
DawoudSheraz
871f3bfb7e conditional logs to find the inconsistent block id in MITx course 2019-11-27 12:28:15 +05:00
Awais Jibran
7940ce3d74 Merge pull request #22403 from edx/aj/fix-course-key-encoding 
Fix quote Unicode data
 2019-11-27 11:26:03 +05:00
Alex Wang
f42d2edd29 Fix xss warnings (#22408) 2019-11-26 20:15:33 -05:00
Michael Terry
2213c4dd3d Support courses with only a verified mode 2019-11-26 15:57:29 -05:00
Feanil Patel
77c5ba62a2 Sort tox passenvs. 2019-11-26 15:31:48 -05:00
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
Awais Jibran
b39f541fab Fix quote Unicode data 2019-11-26 17:22:11 +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