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

4949 Commits

Author SHA1 Message Date
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp 
remove mailchimp tracking
 2019-10-15 09:47:08 -04:00
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Awais Qureshi
c446964721 BOM-916 
Fixed double decoding issue.
Fixed the mock.assertMethod. Dict keys were coming different order.
 2019-10-11 18:24:28 +05:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
Manjinder Singh
b8495dd6b7 Merge pull request #21793 from edx/msingh/test_requirejs_path_overrides_fix 
BOM-614: AssertionError: Lists differ Fix 2 and 3
 2019-10-09 11:34:59 -04:00
jinder1s
feb3e5f0a5 calling assertCountEqual 2019-10-09 10:58:23 -04:00
Manjinder Singh
a315317315 Merge branch 'master' into msingh/python3_test_lti_stub_py 2019-10-09 08:51:15 -04:00
jinder1s
d025657942 review fixes 2019-10-09 08:49:25 -04:00
Aarif
a383c7fdb8 Merge pull request #21886 from edx/BOM-867 
Updated the API to properly parse Query parameters to make it compatible with python 3 - BOM-867
 2019-10-09 15:41:05 +05:00
adeelehsan
8914d982e7 Merge pull request #21723 from edx/aehsan/prod-655/configuration_model_added_for_bulk_unenroll 
Configuration model added for bulk unenroll command
 2019-10-08 13:51:39 +05:00
jinder1s
bd479292f7 quality fixes 2019-10-07 10:28:38 -04:00
jinder1s
93e11925ff Removing decoding due to it being done in another place 2019-10-07 10:27:55 -04:00
jinder1s
cb8d2f8a74 removing pdb 2019-10-07 10:27:55 -04:00
jinder1s
11284039a5 unicode sandwich 2019-10-07 10:27:55 -04:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
adeelehsan
7908808911 Configuration model added for bulk unenroll command 
Users information will be available in model as csvfile

Prod-655
 2019-10-03 16:33:13 +05:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
aarif
69c73ce211 Updated the API to properly parse Query parameters to make it compatible with python 3 2019-10-01 15:28:11 +05:00
Nimisha Asthagiri
ea17b5942a Merge pull request #21841 from edx/bom/student-python-3 
student app: python-3 upgrade
 2019-09-30 09:24:25 -04:00
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
d6d9a17e67 student app: python-3 upgrade 2019-09-30 08:44:54 -04:00
Nimisha Asthagiri
f8e70bc484 Merge pull request #21837 from edx/bom/third-party-auth-python-3 
third_party_auth python-3 upgrade
 2019-09-30 08:32:41 -04:00
Nimisha Asthagiri
e5c258948d third_party_auth python-3 upgrade 2019-09-28 12:42:51 -04:00
aarif
d832c21a20 python 3 fixes 2019-09-27 17:17:15 +05:00
Awais Qureshi
22d5273994 Merge pull request #21754 from edx/awais786/BOM-593 
BOM-593
 2019-09-27 16:22:20 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742 
BOM-742
 2019-09-27 14:49: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
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Waheed Ahmed
68b5f98485 Save order date attribute and some refactoring. 
Save order placement date attribute so that we don't need to call
ecommerce again. Also did some refactoring.
 2019-09-26 17:46:14 +05:00
Waheed Ahmed
551f690ade Use order date_placed enrollment attribute for refund. 
Use order date_placed enrollment attribute for refund if exist otherwise
fetch it from ecommerce.

PROD-454
 2019-09-26 15:20:00 +05:00
Aarif
6f1c05e28c Merge pull request #21744 from edx/BOM-645 
BOM-645
 2019-09-26 12:36:00 +05:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
Braden MacDonald
8a2d499dd2 Track grades for Blockstore content, emit tracking logs 2019-09-25 10:42:55 -04:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Awais Qureshi
984063c819 BOM-593 
Python3 fix.
 2019-09-24 14:22:45 +05:00
aarif
54cb483fc0 python 3 fixes 2019-09-23 15:30:18 +05:00
Aarif
e7a509faf0 Merge pull request #21704 from edx/BOM-724 
BOM-724
 2019-09-23 14:24:35 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637 
BOM-637
 2019-09-21 17:59:58 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723 
BOM-723
 2019-09-20 15:39:43 +05:00
Ayub
014954cab1 Merge pull request #21709 from edx/BOM-629 
BOM-629
 2019-09-20 15:34:05 +05:00
Ayub
04f3739fac Merge pull request #21713 from edx/BOM-647 
BOM-647
 2019-09-20 15:31:36 +05:00
Awais Qureshi
63ff4c147c BOM-637 
Fixing python3
 2019-09-20 15:19:05 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00