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

3204 Commits

Author SHA1 Message Date
Awais Qureshi
e66de4e49e BOM-1489 
None is not a valid value for posting.
 2020-04-04 19:52:18 +05:00
Waheed Ahmed
69181864cc Fix NoneType object has no attribute backend 
We were passing unstripped password value to `authenticate_new_user()`
after creating a user which was resulting in password mismatch and
was raising this error.

PROD-656
 2020-04-03 21:17:00 +05:00
Matthew Piatetsky
68777a270a Modify the program dashboard to make it pass the bundle parameter which is necessary to see the program discounted price 
REV-1123
 2020-04-02 11:34:02 -04:00
Manjinder Singh
96792cde56 Adding samesite cookie option in django 2.1 and above (#23571) 
* Adding samesite cookie option in django 2.1 and above

Django 2.1 release note: Added the SESSION_COOKIE_SAMESITE setting to set the SameSite cookie flag on session cookies.
 2020-04-02 09:57:18 -04:00
Manjinder Singh
853744656c Changing test to work with django 2.1 and higher (#23573) 
This is part of the django 2 upgrade
 2020-04-02 09:56:22 -04:00
Nimisha Asthagiri
9278521188 Merge pull request #23576 from edx/arch/django21-logout-cookie 
Django2 LoginTest: fix expired cookie date format change
 2020-04-02 07:53:58 -04:00
Syed Muhammad Dawoud Sheraz Ali
cd6549748b add credentials saving in VAL (#23561) 2020-04-02 11:21:09 +05:00
Nimisha Asthagiri
27433ecac0 Django2 LoginTest: fix to accommodate expired cookie date format 2020-04-01 18:25:41 -04:00
Muhammad Soban Javed
05e5c7e6ab Merge pull request #23530 from edx/BOM-1428 
BOM-1428: Fix Django 2.0 test failures in theming management command
 2020-04-02 01:15:42 +05:00
Nimisha Asthagiri
b96d975b97 Django2 enrollments app: course_id str 2020-03-31 14:28:17 -04:00
Nimisha Asthagiri
0a57ff98c0 Merge pull request #23547 from edx/arch/django-22-content-type-gating 
Django2 StackedConfigurationModel: Fix query filter
 2020-03-31 13:32:38 -04:00
Nimisha Asthagiri
5447e86307 Django2 StackedConfigurationModel: Fix query filter 
BOM-1432
 2020-03-31 12:45:44 -04:00
adeelehsan
8d840e6f55 Merge pull request #23529 from edx/revert-23509-aehsan/prod-1222/added_logs_for_investigation 
Revert "Added logs for investigation"
 2020-03-31 12:31:05 +05:00
Tim McCormack
5edc8fd380 Remove test for PREVENT_AUTH_USER_WRITES since code breaks in Django 2 (#23536) 
...and it turns out we don't need the switch anymore, anyway.

When we upgraded to Django 1.11, this flag was added in order to
allow for a database migration that would render the user table
unwriteable for up to half an hour:
https://github.com/edx/edx-platform/pull/17561

This involved swapping out the signal handler for logins via
`user_logged_in.disconnect(django_update_last_login)`, but with
Django 2.0, that disconnect is silently failing (returning
false). Likely the disconnect is now happening too soon.
(See edx-platform/common/djangoapps/student/apps.py line 21 in 61e1eda.)

The result is that by the time the waffle switch is consulted, the
normal handler has already run, and the user's last login date has
already been updated.

For now we're just removing the test, and have filed ARCHBOM-1084 for
followup (deleting the switch and related code).
 2020-03-30 20:28:18 +00:00
Soban Javed
c76d1cff79 fixed error in theme management commands in django 2.0 2020-03-30 20:43:02 +05:00
adeelehsan
82bf1d744a Revert "Added logs for investigation" 2020-03-30 19:15:26 +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
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
Albert (AJ) St. Aubin
9fb65532d6 Added an email search parameter to accounts 2020-03-27 11:24:25 -04: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
adeelehsan
da875856c8 Added logs for investigation 2020-03-27 17:37:37 +05: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
Zaman Afzal
5bff142622 Remove post_reset_login flag from the class based views. (#23452) 2020-03-25 18:49:29 +05:00
Dave St.Germain
d0914ef40c Added 'show calculator' to courseware metadata 2020-03-23 12:00:11 -04:00
David Ormsbee
ad2192e7fe Merge pull request #23392 from open-craft/blockstore-runtime-bug-fix 
Fix Blockstore XBlock Runtime's handling of occasional S3 errors (take 2)
 2020-03-23 09:59:54 -04:00
Matt Tuchfarber
f596a27064 Fix rst formatting for plugin view context ADR 2020-03-18 14:02:05 -04:00
Matt Tuchfarber
2559c42836 Merge pull request #23330 from edx/tuchfarber/add_dashboard_context 
Allow plugins to update contexts in specific views
 2020-03-18 10:29:56 -04:00
Awais Jibran
1296b6a79d Merge pull request #23427 from edx/logs-cleanup 
Remove/Limit log.info
 2020-03-18 12:08:23 +05:00
Matt Tuchfarber
0a8b06a122 Lints and final tweaks 2020-03-17 22:19:22 -04:00
Cory Lee
d0c3f16c2c DENG-17 Make schedules and schedulehistory the same (#23419) 2020-03-17 14:40:04 -04:00
Awais Jibran
e3069877af 383k instance / 7 days. 2020-03-17 16:59:19 +05:00
Matt Tuchfarber
8a48218628 Typos, constant names, add context nesting. 2020-03-16 17:39:24 -04:00
David Ormsbee
e9dbed948b Merge pull request #21365 from open-craft/agrendalath/one-letter-extra-fields 
Allow one letter extra fields
 2020-03-16 14:29:10 -04:00
Cory Lee
43b3a2004c Readd historical schedule fks (#23414) 
* Readd historical schedule fks
 2020-03-16 11:22:17 -04:00
Awais Qureshi
0f002bafb8 BOM-1399 
checking django-wiki and fixing deprecation warnings.
 2020-03-16 14:37:18 +05:00
Hammad Ahmad Waqas
f692739da3 Merge pull request #23191 from edx/hammad/ENT-2580 
ENT-2580 | added management command to push old enrollments to ecommerce
 2020-03-16 12:55:38 +05:00
Matt Tuchfarber
fc3bc032b9 Update with suggestions: 
- Add ADR describing Plugin Contexts
- Remove app-specific constants from framework-level code
- Add dashboard constants to student app with README
 2020-03-13 15:14:37 -04:00
Simon Chen
a47f4d7570 Fix flaky test in Catalog Integration Configuration Model 2020-03-13 11:28:03 -04:00
Michael Terry
2d845385e9 Merge pull request #23399 from edx/mikix/update-subquery 
Avoid subquery on table being updated
 2020-03-13 11:21:07 -04:00
Michael Terry
3775fb1d9e Avoid subquery on table being updated 
MySQL doesn't like you subquerying on the same table you are trying
to update in one query.

https://dev.mysql.com/doc/refman/8.0/en/subquery-restrictions.html

PROD-1366
 2020-03-13 10:53:23 -04:00
Albert (AJ) St. Aubin
a5ec801a2a Add an Admin page view to add External IDs for Users in bulk 
[MICROBA-152]
 2020-03-13 10:20:24 -04:00
Cory Lee
22bd5cccae Dropping start from historicalschedule (#23390) 2020-03-13 09:53:43 -04:00
Braden MacDonald
a8d5749b6b Fix: transient S3 errors were not being reported properly 
Also improve usefulness of some blockstore runtime logs for debugging

Context:

Sometimes when trying to load an XBlock's XML file from Amazon S3, AWS will return a 4xx or 5xx response along with error XML like:

    <Error><Code>NoSuchKey</Code><Message>The specified key does not exist.</Message><Key>foo/bar</Key>...</Error>

A bug in the get_bundle_file_data_with_cache method would cause this XML to be returned to the runtime anyways, as if it were the expected OLX. This would then (obviously) lead to strange parsing bugs, e.g. when trying to interpret <Code> as an <xblock-include>.

This fixes the bug and improves the logging, both to make this sort of issue easier to debug in the future and to return whatever detailed error code S3 provides (or Blockstore, if S3 is not being used).
 2020-03-12 16:29:43 -07:00
Abdul Hannan
fa6633ba4e DO NOT MERGE - NEED FAKE - Rename start in schedule 5/5 (#22392) 
* Remove start field in Schedules

Co-authored-by: hunytalk <ahannan@edx.org>
Co-authored-by: Cory Lee <cory@edx.org>
 2020-03-12 15:40:19 -04:00
David Ormsbee
09c5432415 Revert "Fix Blockstore XBlock Runtime's handling of occasional S3 errors" 2020-03-12 15:09:23 -04:00
David Ormsbee
22af9ff545 Merge pull request #23241 from open-craft/blockstore-runtime-bug-fix 
Fix Blockstore XBlock Runtime's handling of occasional S3 errors
 2020-03-12 09:17:09 -04:00
Awais Jibran
ebd6494af2 Merge pull request #23380 from edx/logs-cleanup 
Remove unnecessary logs.
 2020-03-12 16:38:54 +05:00
Awais Jibran
6a25ca800b ~200k instances in last 7 days. 2020-03-12 14:22:52 +05:00
Zainab Amir
ed25521f61 Enable testing pipeline for video uploads to s3 (#23375) 
Add integration settings to enable upload of videos from from studio.
Settings enable user to connect to s3 bucket using mfa and assume role
functionality.

PROD-1214
 2020-03-12 12:19:52 +05:00
Matt Tuchfarber
bd9dbdf7de Syntax fix 2020-03-11 15:17:59 -04:00