Commit Graph

2865 Commits

Author SHA1 Message Date
uzairr
4efe22c959 Disable language preference cookie to mobile views.
Language preference cookie is not allowing to change the site
language on mobile-apps affecting user-experience.To improve it,
mobile team suggested to disable the language preference cookie
for the request originated from mobile.

PROD-782
2019-10-30 17:12:10 +05:00
adeel khan
61f7cf25b2 Merge pull request #22175 from edx/adeel/prod_810_fixing_course_title_escaping
Fixing templates for double escaping.
2019-10-30 16:27:58 +05:00
Manjinder Singh
6f1be3ed2c BOM-933: Fix type mismatches in various migrations 6 (#22170)
* Fix type mismatches in coursewaqre

* Fix type mismatch in credit migrations

* Fix type mismatch in status migrations

* Fix type mismatch in user_api migrations

* Review Fixes
2019-10-29 10:36:10 -04:00
Nimisha Asthagiri
f533134db1 Merge pull request #22086 from edx/arch/user-authn-delete-deprecated
User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION
2019-10-29 09:37:53 -04:00
Nimisha Asthagiri
db42c7e1e2 User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION 2019-10-29 08:57:58 -04:00
Adeel Khan
e9708ca6e0 Fixing templates for double escaping.
Some of the email templates are escaped
in such a way that could potentially cause
double escaping i.e via django default behaviour
and other via interpolate_html tag. Fixing it
by only applying escape via tag.

PROD-810
2019-10-29 14:58:05 +05:00
Hassan Javeed
86f0f42520 Replace 'NULL' with None. 2019-10-28 16:05:45 +05:00
adeelehsan
edd8887e47 Merge pull request #22152 from edx/aehsan/prod-734/added_logs_in_lang_pref_middleware
Logs added to investigate the middleware
2019-10-25 15:52:57 +05:00
adeelehsan
88e7589a19 Logs added to investigate the middleware 2019-10-25 15:27:26 +05:00
Awais Qureshi
96400a9674 Merge pull request #22137 from edx/awais786/BOM-981-982
BOM-981
2019-10-25 14:52:52 +05:00
Ayub
6d471e24ac Merge pull request #22142 from edx/BOM-987-2
BOM-987
2019-10-25 11:00:53 +05:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147)
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
2019-10-24 16:08:04 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146)
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
2019-10-24 13:47:51 -04:00
Manjinder Singh
a384e753fd BOM-933: Fix type mismatches in various migrations (#22112)
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
2019-10-24 11:42:39 -04:00
Ayub khan
7428c23fb0 BOM-987
django_comment_common: Explicitly Set fields to unicode to avoid migration
2019-10-24 17:31:57 +05:00
Awais Qureshi
82fb16b2f7 BOM-981,983,984
Fixing migrations.
2019-10-24 14:53:39 +05:00
Ayub
7554eb1afd Merge pull request #22110 from edx/BOM-951
BOM-951
2019-10-24 12:54:34 +05:00
adeelehsan
bf10345e3a Merge pull request #22127 from edx/aehsan/prod-734/added_logs
Added logs to investigate the issue
2019-10-24 00:42:36 +05:00
adeelehsan
16d637c63f Added logs to investigate the issue 2019-10-24 00:06:32 +05:00
Manjinder Singh
a40f1d9bd6 BOM-933: Fix type mismatches in various migrations 2 (#22115)
* Fix type mismatches in track migrations

* Fix type mismatches in oauth_dispatch

* Fix type mismatches in badges migrations

* fix type mismatch in contentserver migrations

* Fix type mismatches in mobile_api migrations

* fix type mismatch in crawlers migrations

* fix type mismatch in dark_lang migrations

* fix type mismatch in branding  migrations
2019-10-23 13:04:36 -04:00
Ayub khan
49032ba88e BOM-951
waffle_utils: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:11:34 +05:00
Hassan
29828d781c Merge pull request #21969 from edx/hassan/backfill-history
Added management command to populate history from snapshot data.
2019-10-23 02:13:10 +05:00
Robert Raposa
8c9d63ef6c Fix typo in comment (#22121) 2019-10-22 17:04:42 -04:00
Hassan Javeed
edb732d83a Added management command to populate history as of 06/29. 2019-10-23 01:43:13 +05:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -04:00
adeelehsan
3b528f445c Merge pull request #21950 from edx/aehsan/prod-735/logged_improverd_cache_miss_hit
Logged improved for cache
2019-10-21 23:50:37 +05:00
Feanil Patel
13a73fd776 Fix type mismatches in the django_comment_common migrations.
Mixing byte and unicode strings causes migrations to fail.
2019-10-21 11:40:54 -04:00
Feanil Patel
6584f81198 Fix type mismatches in the course_groups migration.
Mixing byte and unicode strings causes migrations to fail.
2019-10-21 10:54:31 -04:00
Feanil Patel
3d51bc7be3 Fix type mismatches in the bookmarks migration.
Mixing byte and unicode strings causes migrations to fail.
2019-10-21 10:53:59 -04:00
adeelehsan
c2600c44f2 Logged improved for cache
prod-735
2019-10-21 19:36:10 +05:00
Muhammad Ammar
19fd375dc9 Merge pull request #22012 from edx/ammar/ent-1964-allow-user-to-edit-fullname-if-no-social-auth-record
allow user to edit fullname if no social auth record exists
2019-10-21 11:35:26 +05:00
Ned Batchelder
ea30aba6fc Revert pull request #22042
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
2019-10-18 15:31:09 -04:00
Ned Batchelder
855346e9e1 Merge pull request #22042 from mahyard/activation-email-to-ace
Activation email to ace
2019-10-18 12:10:20 -04:00
muhammad-ammar
fc2915b02f allow user to edit fullname if no social auth record
ENT-1964
2019-10-18 15:30:51 +05:00
Ned Batchelder
69255bee73 Merge pull request #21816 from regisb/regisb/simplify-swagger-auto-schema
Regisb/simplify swagger auto schema
2019-10-15 14:35:46 -04:00
Zia Fazal
ebe29d9303 Merge pull request #21943 from edx/ziafazal/ENT-1688
ENT-1688: Changed logout message on on logout screen for Enterprise SSO flow
2019-10-15 18:53:34 +05:00
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp
remove mailchimp tracking
2019-10-15 09:47:08 -04:00
Zia Fazal
c718c02d6e Show blank screen instead of logout message for Enterprise SSO flow
Changes to show blank screen instead of logout message for Enterprise SSO flow. It confuses learner when they are already signed in and access their course from B2B site.
ENT-1688

Fixed pep8 quality violation

use testserver as HOST instead of edx.org

assert enterprise app is enabled

added logging

Print different values

Reload django url config

assert all quote operations to see how they work on jenkins

debug url resolved values

login user in setup

added log to debug test on jenkins

Using UrlResetMixin

Using regex instead of resolve

Fixed quality violation

Fixed pylint quality violations

Fixed target interpolation syntax

Added developer's comment
2019-10-15 18:28:19 +05:00
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
aarif
6c98571bbd removed unnecessary encode method to fix input to csv write method
removed unnecessary encode method to fix input to csv write method
2019-10-14 16:17:11 +05:00
Régis Behmo
ae216c8584 Rename API decorators to "apidocs" to be provider-agnostic
The API documentation decorators do not have to leak which solution we
use to generate the docs. Here, and as discussed in PR #21820, we rename
the `openapi` module to `apidocs`, and we make sure that this module
includes all the right functions to document API Views without referring
to Open API.
2019-10-14 08:14:18 +02:00
Régis Behmo
1d9a5ab4e7 Rename swagger_auto_schema decorator 2019-10-14 08:14:08 +02:00
Régis Behmo
59635b689e Simplify BookmarksListView.get docs
Instead of relying on a `method_decorator`, we explicitely declare the
`get` method.
2019-10-14 08:14:08 +02:00
Régis Behmo
dac393e9e7 Auto-document API endpoints using view function docstring
The `swagger_auto_schema` view function decorator allows us to
auto-document API endpoints. All swagger arguments are passed as kwargs
to the decorator, but this feels a bit unnatural: we would like to use
the function documentation as the endpoint summary and description. We
introduce this feature here by reading the `__doc_`_attribute of the
view function.
2019-10-14 08:14:08 +02:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
Awais Qureshi
4387f753d5 BOM-912
Can't convert 'bytes' object to str implicitly
2019-10-10 16:06:17 +05:00
aarif
91bed37922 Updated the expected error message to get assertion successful for both python versions
changes made as suggested
2019-10-09 16:03:50 +05:00
Aarif
6a2f3d6dbc Merge pull request #21866 from edx/BOM-831
Updated the string input to md5 to make output compatible with both python versions - BOM-831
2019-10-09 15:40:33 +05:00
Aarif
97452b31ae Merge pull request #21881 from edx/BOM-873
Updated the division operation to make the output compatible with both python versions - BOM-873
2019-10-08 13:41:15 +05:00