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

3885 Commits

Author SHA1 Message Date
Matthew Piatetsky
c7c4f6073d Merge pull request #21798 from edx/PROD-713 
show graded content block without the upsell when the upgrade deadline is expired
 2019-09-27 09:54:26 -04:00
Hassan Javeed
8ad77f7f0c Removed one-off management commands. 2019-09-27 18:04:16 +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
Matthew Piatetsky
0c03138229 show graded content block without the upsell when the upgrade deadline is expired 2019-09-26 17:49:08 -04: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
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
noraiz-anwar
67af4b8eb1 fix course import issue 2019-09-26 18:00:21 +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
aarif
ac37cc6fd0 python 3 fixes 
minor changes

minor fixes

minor fixes
 2019-09-26 17:09:52 +05:00
Ayub khan
d1ff659942 BOM-671 
python3 compatibility
 2019-09-26 14:26:05 +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
Zia Fazal
8c9b13e6fc Merge pull request #21770 from edx/ziafazal/ENT-2268 
ENT-2268: Added signal handler for COURSE_GRADE_NOW_PASSED
 2019-09-25 23:31:36 +05:00
Zia Fazal
19436f8d3d Bumped edx-enterprise version to 1.10.7 
Fixed broken unit test

connected COURSE_GRADE_NOW_PASSED at the end

added receiver to signal connect call
 2019-09-25 22:32:53 +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
Aarif
22992029f8 Merge pull request #21755 from edx/BOM-658 
BOM-658
 2019-09-25 15:19:01 +05:00
Aarif
5f3b5d6110 Merge pull request #21748 from edx/BOM-586 
BOM-586
 2019-09-25 14:55:12 +05:00
Zia Fazal
b73979dc72 Added signal handler for COURSE_GRADE_NOW_PASSED 
Added signal handler for COURSE_GRADE_NOW_PASSED to trigger single learner data transmission task in edx-enterprise.

Bumped edx-enterprise version to 1.10.7

Revert edx-enterprise version bump
 2019-09-25 14:30:49 +05:00
Jeremy Bowman
6cfa08d21d Fix CSV writing in test BOM-639 (#21762) 2019-09-24 12:13:59 -04:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
aarif
11fe396314 python 3 fixes 2019-09-24 15:38:01 +05:00
Awais Qureshi
6d5ea3b7ea Merge pull request #21732 from edx/awais786/BOM-584 
Awais786/bom 584
 2019-09-24 14:37:37 +05:00
Awais Qureshi
1f92b080f7 Merge pull request #21733 from edx/awais786/BOM-581 
BOM-581
 2019-09-24 14:26:29 +05:00
Emma Green
cf6f9ea06a Merge pull request #21739 from edx/emma-green/REV-970/enterprise-users-should-not-get-first-purchase-discount 
enterprise users should not get the first purchase discount
 2019-09-23 15:04:09 -04:00
Emma Green
4783aed927 Enterprise users should not get the first purchase discount. 2019-09-23 14:30:38 -04:00
Ned Batchelder
e1a3d66143 Merge pull request #21220 from eduNEXT/coa/course-index-regex 
Making the regex that gets the index courses more secure
 2019-09-23 11:32:28 -04:00
aarif
822af10479 python 3 fixes 
quality fixes
 2019-09-23 19:22:40 +05:00
aarif
70f51de25b python 3 fixes 
quality fixes

python 3 fixes

quality fixes
 2019-09-23 17:21:37 +05:00
Hassan Javeed
23cd4d9899 Management command to add history to course_overviews_courseoverview. 2019-09-20 23:50:01 +05:00
Matthew Piatetsky
d6dbaabd33 Merge pull request #21720 from edx/emma-green/use-the-user-from-parameter-to-check-flag 
use the specified user from the parameter to determine if the flag is…
 2019-09-20 10:49:23 -04:00
Kyle McCormick
298c3498ae Add course_exists utility to CourseOverview class 2019-09-20 09:55:13 -04:00
Awais Qureshi
62595bba75 BOM-581 
Fixing python3
 2019-09-20 18:32:22 +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
Awais Qureshi
f10df9dd5e BOM-581 
Fixing python3
 2019-09-20 16:30:15 +05:00
Awais Qureshi
75b5fffb87 BOM-584 
Fixing python3
 2019-09-20 16:11:47 +05:00
Awais Qureshi
718fb0f5b8 BOM-585 
Fixing python3
 2019-09-20 16:03:28 +05:00
Awais Qureshi
4abaef5324 BOM-729 
Fixing python3
 2019-09-20 15:52:29 +05:00
Ayub
fe61a3cddc Merge pull request #21712 from edx/BOM-574 
BOM-574
 2019-09-20 15:32:36 +05:00
Awais Qureshi
fbd94fc289 BOM-627 
Fixing python3
 2019-09-20 15:03:02 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00
Feanil Patel
0e1ad4cd26 Fix pylint error in email_opt_in_list. 2019-09-19 16:19:37 -04:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04:00
Braden MacDonald
e1d2257fe0 Fix: new runtime was not mixing 'has_score' into XBlocks 2019-09-19 12:53:37 -07:00
Emma Green
502c8b5bf5 use the specified user from the parameter to determine if the flag is enabled, rather than the request's user 2019-09-19 15:51:57 -04:00