Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,792 Commits 1 Branch 0 Tags
8d951ae8aeacff2fdc25867dcc72d5b9ffe4bb39
Commit Graph

53792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danial Malik
8d951ae8ae Import private.py in devstack_docker.py files instead of devstack.py (#23512) 
Background: I use private.py a lot in my devstack for my private configurations. But issues are raised when I need to change/override a setting that is defined in devstack_docker.py file. Since that file's contents are loaded after private.py, my private.py is useless against the settings in devstack_docker.py.

Description: Now that the devstack is dockerized, I think it makes more sense to import the private.py in the devstack_docker.py files i.e. at the end of configuration files hierarchy.
 2020-03-30 09:38:25 -04:00
M Zulqarnain
0aba1af792 Merge pull request #23526 from edx/zulqarnain/BOM-1422 
BOM-1420 : Fix Django 2.x tests in Discussion app
 2020-03-30 17:48:47 +05:00
Zulqarnain
34bece208a Fix discussion notif pref tests 2020-03-30 16:01:06 +05:00
Saad Yousaf
4c5006988f Merge pull request #23267 from edx/saad/PROD-1287 
[PROD-1287] - initial work to optimise problem_grade_report code.
 2020-03-30 15:14:10 +05:00
Waheed Ahmed
a23a31c2be Allow Block Structures Collect to work in Studio. 
The collect process was broken before this commit because Studio's
runtime does not permit handler_url invocation on "thirdparty"
XBlocks.

PROD-1393
 2020-03-30 13:24:34 +05:00
SaadYousaf
4e4bffe404 initial work to optimise problem_grade_report code. 2020-03-30 13:14:01 +05:00
Aarif
f7143906b6 Merge pull request #23472 from edx/BOM-1416 
Fixed template engine error under Django 2 - BOM-1416
 2020-03-30 11:38:14 +05:00
edX Transifex Bot
5f63c07ac7 fix(i18n): update translations 2020-03-29 17:24:51 -04:00
Aarif
765942d7d2 Updated the template loaders to make them compatible with django 1.11,2.0 and above 2020-03-28 13:27:38 +05:00
Ned Batchelder
136003fcff Merge pull request #23015 from Abstract-Tech/fix/non-admin-error-descriptor 
Add xblock.v1 and xmodule.v1 entrypoints for NonStaffErrorDescriptor
 2020-03-27 17:43:16 -04:00
Zachary Hancock
b9bafed817 add pending role assignment model (#23506) 2020-03-27 14:29:09 -04:00
Albert (AJ) St. Aubin
c4bd06210e Merge pull request #23503 from edx/aj/email_account 
Added an email search parameter to accounts
 2020-03-27 12:35:01 -04:00
Albert (AJ) St. Aubin
9fb65532d6 Added an email search parameter to accounts 2020-03-27 11:24:25 -04:00
Brandon Baker
824067bf3f Upgrade edx-enterprise to 3.0.3 (#23515) 
Upgrade uses renamed enterprise catalog endpoints
 2020-03-27 11:14:40 -04:00
Ahtisham Shahid
42ccc5564c Merge pull request #23498 from edx/ahtisham/PROD-1232 
Fixed \n escape issue in import-export
 2020-03-27 18:39:29 +05:00
adeelehsan
c04341f863 Merge pull request #23509 from edx/aehsan/prod-1222/added_logs_for_investigation 
Added logs for investigation
 2020-03-27 18:21:21 +05:00
edX cache uploader bot
a7494b22fc Updating Bokchoy testing database cache (#23511) 2020-03-27 08:58:58 -04:00
adeelehsan
da875856c8 Added logs for investigation 2020-03-27 17:37:37 +05:00
AsadAzam
15f73195e4 Merge pull request #23451 from edx/asad/prod-1369 
Fixed comparison mismatch
 2020-03-27 14:00:36 +05:00
Syed Muhammad Dawoud Sheraz Ali
0f125e7bc3 update val (#23510) 2020-03-27 12:38:19 +05:00
Ahtisham Shahid
f264e5dd03 fixed \n escape issue in import 
updated test

updated test
 2020-03-27 12:29:32 +05:00
David Ormsbee
b2cedf7312 Merge pull request #23501 from edx/ormsbee/unpin-edx-when 
Make upgrade to get the latest edx-when (1.1.3)
 2020-03-26 12:43:39 -04:00
David Ormsbee
1e8b6d5a00 Make upgrade to get the latest edx-when (1.1.3) 
Also pinned httpretty < 1.0 because that upgrade broke many tests.
 2020-03-26 12:06:27 -04:00
Calen Pennington
e867c39763 Merge pull request #23495 from cpennington/unpin-edx-when 
Unpin edx-when
 2020-03-26 09:51:39 -04:00
Nick
f37c860c87 Merge pull request #23448 from edx/ndalfonso/AA-38-calendar-sync-email-template 
AA-38 calendar sync email template
 2020-03-26 08:51:53 -04:00
asadazam93
fc3e63714e Fixed comparison mismatch 2020-03-26 14:11:31 +05:00
Waheed Ahmed
ccbd353201 Revert "Allow Block Structures Collect to work in Studio" 2020-03-26 13:22:10 +05:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template 
- create templates and methods to build/send calendar sync emails.
 2020-03-25 16:40:19 -04:00
Calen Pennington
61c1909b6c Unpin edx-when 2020-03-25 15:16:06 -04:00
edX cache uploader bot
a43edcb026 Updating Bokchoy testing database cache (#23494) 2020-03-25 15:11:34 -04:00
Calen Pennington
7340d39e5f Merge pull request #23493 from edx/revert-23487-revert-23485-upgrade-edx-when-again 
Revert "Revert "Upgrade edx-when to read XBlock dates out of the read-replica""
 2020-03-25 14:30:47 -04:00
Calen Pennington
5551ef08bf Revert "Revert "Upgrade edx-when to read XBlock dates out of the read-replica"" 2020-03-25 14:29:48 -04:00
Simon Chen
b1f61d929d MST-157 Part 3 Create the Program Enrollments Inspector tool UI and link to the Support tool index page 2020-03-25 13:08:48 -04:00
Jason Myatt
ce3f6e2b88 Merge pull request #23491 from edx/jmyatt/pin-edx-when-version 
Temporarily pin edx-when version
 2020-03-25 12:59:48 -04:00
Dave St.Germain
54b775eddc Merge pull request #23474 from edx/dcs/calculator-metadata 
Added 'show calculator' to courseware metadata
 2020-03-25 12:25:41 -04:00
Jason Myatt
78c59cdad7 Temporarily pin edx-when version 2020-03-25 11:58:15 -04:00
Awais Jibran
3ff96ef6be Merge pull request #23479 from edx/logs-cleanup 
Logs cleanup
 2020-03-25 19:53:35 +05:00
Zaman Afzal
5bff142622 Remove post_reset_login flag from the class based views. (#23452) 2020-03-25 18:49:29 +05:00
Feanil Patel
9afe536731 Merge pull request #23486 from edx/feanil/flaky_a11y 
Get rid of 2 flaky a11y tests.
 2020-03-25 09:07:02 -04:00
Awais Jibran
bb4b38b30b Do not log after sending activation email 2020-03-25 11:54:28 +05:00
Calen Pennington
016dfd64fa Merge pull request #23487 from edx/revert-23485-upgrade-edx-when-again 
Revert "Upgrade edx-when to read XBlock dates out of the read-replica"
 2020-03-24 16:34:59 -04:00
Calen Pennington
c8fcab315e Revert "Upgrade edx-when to read XBlock dates out of the read-replica" 2020-03-24 16:30:50 -04:00
Feanil Patel
6367962846 Get rid of 2 flaky a11y tests. 2020-03-24 16:27:32 -04:00
Usama Sadiq
3c563e072d BOM-1404 Updated tox settings (#23439) 
Issue: https://openedx.atlassian.net/browse/BOM-1404

* Fixed Django 2.x installation process in tox
* Updated xdist worker Django installation code
* Use correct tox environment variable name

Co-authored-by: Jeremy Bowman <jbowman@edx.org>
 2020-03-24 15:06:47 -04:00
Calen Pennington
cbd875b05d Merge pull request #23485 from cpennington/upgrade-edx-when-again 
Upgrade edx-when to read XBlock dates out of the read-replica
 2020-03-24 14:41:49 -04:00
Calen Pennington
246ad6c906 Upgrade edx-when to read XBlock dates out of the read-replica 2020-03-24 13:56:43 -04:00
Adam Butterworth
a2c4b00246 Skip flaky courseware MFE redirect tests (#23483) 2020-03-24 12:50:14 -04:00
Calen Pennington
eb7b3b16e9 Merge pull request #23482 from cpennington/upgrade--edx-when 
Upgrade edx-when and edx-django-utils for better database usage
 2020-03-24 12:14:57 -04:00
Calen Pennington
576b0ec833 Upgrade edx-when and edx-django-utils for better database usage 2020-03-24 11:47:50 -04:00
Hammad Ahmad Waqas
1546198ab1 Merge pull request #23478 from edx/hammad/ENT-2580 
ENT-2580 | added sleep of 1 second in create_orders_for_old_enterprise_course_en…
 2020-03-24 17:31:54 +05:00