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

695 Commits

Author SHA1 Message Date
Ayub khan
298fbdaec2 BOM-894 python3 order mismatch 
Python3 arguments have different positions as compared to python2
 2019-10-09 15:06:27 +05:00
Ayub khan
09843b993c BOM-893 
python3 compatibility: regex needs bytes type strings to check bytes type response
 2019-10-03 15:54:04 +05:00
Feanil Patel
59ae37b3ba Merge pull request #21903 from edx/feanil/fix_date_mock 
Fix datetime mock to only mock the now function.
 2019-10-02 09:44:57 -04:00
Feanil Patel
3132982141 Fix datetime mock to only mock the now function. 2019-10-01 16:17:45 -04:00
Diana Huang
ff795347dd Annotate a few of the course_experience waffle flags. 2019-10-01 16:03:36 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -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
Stu Young
7c6c166e73 fix toggle implementation annotations (#21802) 
fix toggle implementation annotations and rename waffle flags
 2019-09-27 11:45:40 -04:00
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
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
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04: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
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
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +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
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Emma Green
4783aed927 Enterprise users should not get the first purchase discount. 2019-09-23 14:30:38 -04: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
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04: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
DawoudSheraz
197d281a1b speech output for completion checkmarks 2019-09-11 09:26:51 +05:00
Awais Jibran
f98c819f74 Merge pull request #160 from edx/aj/add-noopener-to-new-window-urls 
Update hyperlinks in platfrom
 2019-09-06 11:43:38 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Awais Jibran
1a4eb7d2e8 Pervent reverse tabnabbing in edx platform 2019-08-28 16:08:34 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Emma Green
ef71b51137 Merge pull request #21399 from edx/emma-green/REV-901/remove-user-join-from-holdback 
remove user.joined_date from holdback as this condition will create a…
 2019-08-21 12:22:53 -04:00
Emma Green
fc003c428d remove user.joined_date from holdback as this condition will create a difference in the two a/b groups 2019-08-21 11:56:37 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Emma Green
48c17803c2 add endpoint that takes a user id to allow us to correctly get the discount after checkout to correctly create order 2019-08-16 10:55:39 -04:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
Christie Rice
bf414335cc REVMI-354 Add edit_bookmark permission (#21254) 2019-08-02 11:01:43 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Calen Pennington
03d7d87850 Merge pull request #21160 from cpennington/fbe-orphan-block 
Only attempt to use the parent's CONTENT_GATING_PARTITION settings if…
 2019-07-29 09:29:47 -04:00
Ayub
044dc5f10a Merge pull request #21038 from edx/INCR-384 
INCR-384 python 3 compatibility
 2019-07-22 14:24:00 +05:00
Calen Pennington
0e187f85b7 Only attempt to use the parent's CONTENT_GATING_PARTITION settings if there is actually a parent 2019-07-18 15:08:12 -04:00
Aarif
d0a73e7f1a Merge pull request #21037 from edx/INCR-382 
INCR-382 Python 3 compatibility
 2019-07-18 13:13:47 +05:00
Awais Qureshi
6f3680ced5 Merge pull request #21039 from edx/awais786/INCR-383 
INCR-383
 2019-07-17 12:22:37 +05:00
Ayub khan
33227b8a72 INCR-384 python 3 compatibility 2019-07-10 16:31:18 +05:00
arbisoft
fe86f4e45a Fixing python-modernize issues. 2019-07-10 15:30:23 +05:00
aarif
87e498587b ran python-modernize and isort on files mentioned in INCR-382 2019-07-10 15:24:18 +05:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
Calen Pennington
708118f9c0 Enable holdback in first purchase discounts 2019-07-03 15:23:34 -04:00
Calen Pennington
8b4b5a4547 Move stable_bucketing into its own library to minimize circular dependencies 2019-07-03 15:03:31 -04:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
uzairr
789a48e27b Update enrollment support view 
Currently, entitlement view is not displaying any message if there
are no records against a query.To improve user experience, changes
have been made so that a proper message would be displayed.

LEARNER-7155
 2019-06-27 14:48:05 +05:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase 
REVEM-289: Discount no previous purchase
 2019-06-25 17:12:19 -04:00
Calen Pennington
f07f2121ba Make has_non_audit_enrollments exclude entitlements 2019-06-25 16:44:36 -04:00