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

2825 Commits

Author SHA1 Message Date
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
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
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
Braden MacDonald
b7d1827017 Fix minor unicode OLX bug 2019-10-07 16:43:47 -04:00
Calen Pennington
9a800fb180 Downgrade content-highlights mismatches to warnings, and add the course-key to the error message 2019-10-04 10:35:03 -04:00
Aarif
8cf25ea81a Merge pull request #21883 from edx/BOM-874 
Updated the division operation to make the output compatible with both python versions - BOM-874
 2019-10-03 12:40:19 +05:00
Adeel Khan
f11afb57a2 Adds migration for simulate publish command 
A rewording of help text caused django to create
a new migration for config model and that was not
initially pushed to master.
 2019-10-02 14:45:43 +05:00
aarif
86c7b9f809 updated the division operation to make the output compatible in python 2 and python 3 
changes made to fix quality errors

changes made to fix issues on BOM-587

minor changes made to fix quality issues

minor changes

removed unused pylint supression
 2019-10-02 14:01:08 +05:00
aarif
e6470fb970 python 3 fixes 
changes made to fix quality errors

changes made to fix quality errors

minor changes
 2019-10-02 12:13:45 +05:00
David J. Malan
680f62278c AccessTokenView: support for X-Token-Type in HTTP header (#21662) 
* AccessTokenView: support for X-Token-Type in HTTP header
 2019-10-01 15:57:21 -04:00
aarif
b7ee87caba updated the division to make the output compatible in python2 and python3 2019-10-01 13:27:32 +05:00
Aarif
bc6821ce53 Merge pull request #21810 from edx/BOM-745 
BOM-745
 2019-10-01 11:58:09 +05:00
Ayub
df066afdf7 Merge pull request #21848 from edx/BOM-882 
BOM-881, BOM-882
 2019-10-01 10:39:53 +05:00
aarif
df2686dc63 updated input to md5 method to properly hash the input in both python versions 2019-09-30 19:55:15 +05:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
95c2e49438 Merge pull request #21840 from edx/bom/block-structure-python-3 
block_structure python-3 upgrade
 2019-09-30 08:33:32 -04:00
Nimisha Asthagiri
468f1ad393 Merge pull request #21839 from edx/bom/course-overviews-python-3 
course_overviews python-3 upgrade
 2019-09-30 08:33:17 -04:00
Nimisha Asthagiri
4589e05215 Merge pull request #21838 from edx/bom/api-admin-python-3 
api_admin python-3 upgrade
 2019-09-30 08:32:54 -04:00
Ayub khan
86bd5a4643 BOM-881 
python3 compatibility
 2019-09-30 14:58:12 +05:00
Ayub khan
cc4050460e BOM-882 
python3 compatibility
 2019-09-30 14:42:55 +05:00
Aarif
7eee466c68 Merge pull request #21815 from edx/BOM-747 
BOM-747
 2019-09-30 12:59:46 +05:00
Aarif
473398d410 Merge pull request #21792 from edx/BOM-743 
BOM-743
 2019-09-30 12:57:07 +05:00
Nimisha Asthagiri
b0a1a99aa6 block_structure python-3 upgrade 2019-09-28 14:15:24 -04:00
Nimisha Asthagiri
ea0bea8193 course_overviews python-3 upgrade 2019-09-28 14:00:14 -04:00
Nimisha Asthagiri
7c211a5843 api_admin python-3 upgrade 2019-09-28 12:54:34 -04:00
Jeremy Bowman
ead81288ad Always store transformers_schema_version as text BOM-576 (#21823) 2019-09-27 14:33:25 -04:00
Stu Young
7c6c166e73 fix toggle implementation annotations (#21802) 
fix toggle implementation annotations and rename waffle flags
 2019-09-27 11:45:40 -04:00
Jeremy Bowman
88b8e97409 Fix block_structure error handling BOM-577 (#21801) 2019-09-27 10:06:00 -04:00
aarif
14f7990b3e python 3 fixes 2019-09-27 18:05:05 +05:00
Hassan Javeed
8ad77f7f0c Removed one-off management commands. 2019-09-27 18:04:16 +05:00
aarif
a86b44a250 python 3 fixes 2019-09-27 16:56:41 +05:00
Awais Qureshi
2df263662b Merge pull request #21726 from edx/awais786/BOM-627 
BOM-627
 2019-09-27 16:20:19 +05:00
Awais Qureshi
b48fe6162e Merge pull request #21730 from edx/awais786/BOM-729 
BOM-729
 2019-09-27 16:07:16 +05:00
Aarif
889445a2fd Merge pull request #21790 from edx/BOM-741 
BOM-741
 2019-09-27 14:49:23 +05:00
Aarif
5597a86a6b Merge pull request #21773 from edx/BOM-739 
BOM-739
 2019-09-27 14:47:50 +05:00
Ayub
93386c8947 Merge pull request #21786 from edx/BOM-671 
BOM-671
 2019-09-27 09:45:45 +05:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning 
Finally import courseware properly everywhere to get rid of a warning
 2019-09-26 14:25:27 -04:00
Waheed Ahmed
5d6a2ea022 Merge pull request #21787 from edx/waheed/PROD-454-use-order-date-attr-for-refund 
Use order date_placed enrollment attribute for refund.
 2019-09-26 21:20:27 +05:00
aarif
62e26f1273 python 3 fixes 2019-09-26 19:06:12 +05:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
eb694a71b8 python 3 fixes 2019-09-26 18:08:06 +05:00