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

20232 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
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Zia Fazal
0358587320 Merge pull request #22039 from edx/ziafazal/ENT-2384 
ENT-2384: Invoke learner transmission task only for enterprise learners
 2019-10-15 16:42:13 +05:00
Zia Fazal
3b69a4f279 Invoke learner transmission task only for enterprise learners 
Invoke learner transmission task only for enterprise learners
ENT-2384

added docstring

Fixed brokent unit test
 2019-10-15 15:58:37 +05:00
Awais Qureshi
f679768f9e BOM-925 
Fixing TypeError, the JSON object must be str, not 'bytes'.
 2019-10-15 12:57:49 +05:00
Jeremy Bowman
b939791fe0 Fix problematic mock in instructor_task tests BOM-403 (#22007) 2019-10-11 15:44:42 -04:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Douglas Hall
bf3d337312 Fix dismissal of enterprise learner portal banner. (#22015) 2019-10-11 11:49:09 -04:00
Waheed Ahmed
ab49dfa324 Merge pull request #22008 from edx/waheed/PROD-816-remove-youtube-logo 
Remove YouTube logo from footer.
 2019-10-11 15:28:02 +05:00
Ayub
732dfce14d Merge pull request #21996 from edx/BOM-test-fix-test_download_srt_exist 
BOM test_download_srt_exist test fix
 2019-10-11 13:01:47 +05:00
Waheed Ahmed
637e1d0bee Remove YouTube logo from footer. 
Current YouTube logo is not compliant with YouTube's branding
guidelines.

PROD-816
 2019-10-11 12:44:54 +05:00
Douglas Hall
c9aa258495 Do not display enterprise learner portal banner if no enterprise learner portals exist for user. (#22005) 2019-10-10 19:02:15 -04:00
Andytr1
f4738c4b82 Merge pull request #21958 from edx/andytr1/get-override-history-by-grade-id 
EDUCATOR-4700 - pull grade overrides by grade_id
 2019-10-10 13:42:29 -04:00
Awais Qureshi
e44f238611 Merge pull request #21995 from edx/awais786/BOM-913 
BOM-913
 2019-10-10 22:38:55 +05:00
Feanil Patel
2cd474c72d Merge pull request #21970 from edx/feanil/fix_xmodule_video_tests 
Fix video module tests related to transcript conversion.
 2019-10-10 13:32:44 -04:00
atesker
4aff507847 EDUCATOR-4700 - pull grade overrides by grade_id 
pep8

udate filter on simple history

convert to list

diable no member error
 2019-10-10 12:13:07 -04:00
Awais Qureshi
91e7d8a7be BOM-913 
reduce functions moves into functools in python3. Fixed the import.
Fixing bytes issue.
 2019-10-10 20:06:08 +05:00
Feanil Patel
7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests 2019-10-10 11:00:54 -04:00
Awais Qureshi
750b554637 BOM-915 
Fixing bytes and ordering issue.
 2019-10-10 18:00:12 +05:00
Ayub khan
198743f7b0 BOM test_download_srt_exist test fix 
need unicode to compare with unicode string
 2019-10-10 17:17:29 +05:00
Brittney Exline
6e2887f851 Add enterprise portal links to user dropdown menu and dashboard alerts. (#21833) 2019-10-09 16:01:41 -04:00
Feanil Patel
76c578df36 Fix more transcript related tests to be consistent. 2019-10-09 11:00:23 -04:00
Awais Qureshi
9ed328879e BOM-861 
Dictionaries are being rendered into the HTML but in different order between python2 and python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-08 12:45:01 +05:00
Awais Qureshi
7905640df2 Merge pull request #21927 from edx/awais786/BOM-866 
BOM-866
 2019-10-07 19:24:42 +05:00
Awais Qureshi
79b00c9af4 BOM-866 
Dictionaries are being rendered into the HTML but in different order between python2 and python3 and failing tests in python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-07 15:00:41 +05:00
DawoudSheraz
aeeb76edd0 add information for missing annotation fields 2019-10-07 10:55:11 +05:00
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Diana Huang
f724f5b488 Add courseware migration. 2019-10-02 14:11:15 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
atesker
e07635559c EDUCATOR-4365 - display max score for not started assignment 
pep8

moved includes

refactor 1

correted properties

update unit test

pep update

cr 2

made failure case a function
 2019-10-02 08:48:31 -04:00
Aarif
7be6acb880 Merge pull request #21856 from edx/BOM-851 
BOM-851
 2019-10-02 11:44:45 +05:00
Ned Batchelder
d3a1ca9f69 See if this fancy stack trace was stopping newrelic 2019-10-01 18:04:16 -04:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842 
BOM-842
 2019-10-01 10:37:15 +05:00
Stu Young
8c94ee15ea add missing annotation tokens to course api toggles (#21831) 2019-09-30 14:13:03 -04:00
Awais Qureshi
647527f916 Merge pull request #21852 from edx/awais786/BOM-829 
BOM-829
 2019-09-30 22:26:54 +05:00
Awais Qureshi
59cdc80159 Merge pull request #21847 from edx/awais786/BOM-841 
BOM-841
 2019-09-30 22:24:26 +05:00
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
bb419b485d Python 3: assertEqual(response.content.count -> assertContains(.. 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
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
d4832a65aa Python 3: assertNotIn -> assertNotContains consistency 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
adaf79ff73 Merge pull request #21836 from edx/bom/grades-python-3 
Grades python-3 upgrade: test_recalculate_learner_grades.py
 2019-09-30 08:30:07 -04:00
aarif
bec80bb34b python 3 fixes 2019-09-30 16:02:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Awais Qureshi
c96c172b3a BOM-829 
Python3 fix.
 2019-09-30 15:23:03 +05:00