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

51484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e7a509faf0 Merge pull request #21704 from edx/BOM-724 
BOM-724
 2019-09-23 14:24:35 +05:00
edX Transifex Bot
a51c362561 fix(i18n): update translations 2019-09-22 17:22:49 -04:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637 
BOM-637
 2019-09-21 17:59:58 +05:00
Awais Qureshi
ec7f575474 Merge pull request #21678 from edx/awais786/BOM-482 
Awais786/bom 482
 2019-09-21 17:58:13 +05:00
Hassan
bada715554 Merge pull request #21716 from edx/hassan/courseoverview-history 
Management command to add history to course_overviews_courseoverview.
 2019-09-21 00:35:03 +05:00
Hassan Javeed
23cd4d9899 Management command to add history to course_overviews_courseoverview. 2019-09-20 23:50:01 +05:00
Awais Qureshi
a0e4e94e31 BOM-482 
Fixing python3
 2019-09-20 20:18:18 +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
af4e7a348a Create Python API for program_enrollments: Part IV 
This commit completes the program_enrollments LMS app
Python API for the time being. It does the following:
* Add bulk-lookup of users by external key in api/reading.py
* Add bulk-writing of program enrollments in api/writing.py
* Move grade-reading to api/grades.py
* Refactor api/linking.py to use api/writing.py
* Refactor signals.py to use api/linking.py
* Update rest_api/v1/views.py to utilize all these changes
* Update linking management command and support tool to use API
* Remove outdated tests from test_models.py
* Misc. cleanup

EDUCATOR-4321
 2019-09-20 09:55:13 -04:00
Kyle McCormick
298c3498ae Add course_exists utility to CourseOverview class 2019-09-20 09:55:13 -04:00
Kyle McCormick
14d650a522 Style fix: de-dent docstring in linking.py 2019-09-20 09:55:13 -04:00
Ayub
1fda63900c Merge pull request #21666 from edx/BOM-314 
BOM-314
 2019-09-20 18:35:59 +05:00
Ayub
1ac77d8a85 Merge pull request #21691 from edx/BOM-376 
BOM-376
 2019-09-20 18:34:11 +05:00
edX cache uploader bot
79836c3840 Updating Bokchoy testing database cache (#21724) 2019-09-20 09:18:54 -04:00
Feanil Patel
c81cbe8327 Merge pull request #21729 from edx/jenkins/upgrade-python-requirements-a85b30a 
Python Requirements Update
 2019-09-20 09:08:50 -04: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 khan
6f1d379a0f BOM-376 
python3 compatibility fixes all tests
 2019-09-20 16:01:06 +05:00
Ayub khan
7d055023bb BOM-314 
python3 compatibility
 2019-09-20 15:50:48 +05:00
edX requirements bot
04aa8fb7fd Updating Python Requirements 2019-09-20 06:49:36 -04:00
Ayub
a85b30a8b4 Merge pull request #21703 from edx/BOM-273 
BOM-273
 2019-09-20 15:41:54 +05: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
fe61a3cddc Merge pull request #21712 from edx/BOM-574 
BOM-574
 2019-09-20 15:32:36 +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
Usama Sadiq
682e5cad56 Merge pull request #21667 from edx/usama/prod-600-aside-tag-on-dashboard-programs-page 
Dashboard Programs Page Aside tag update
 2019-09-20 12:38:12 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00
Feanil Patel
0c1e18ff53 BOM-622 Fix more type errors. 2019-09-19 16:57:54 -04:00
Thomas Tracy
c6edb954d5 Merge pull request #21719 from edx/ttracy/ent-2305-enterprise-version-bump 
Enterprise Version Bump
 2019-09-19 16:35:47 -04:00
David Ormsbee
75b8c7ea13 Merge pull request #21722 from open-craft/new-runtime-fixes 
Fix: new runtime was not mixing 'has_score' into XBlocks
 2019-09-19 16:25:47 -04:00
Feanil Patel
0e1ad4cd26 Fix pylint error in email_opt_in_list. 2019-09-19 16:19:37 -04:00
Feanil Patel
802929fde4 BOM-622 Type errors in content matching. 2019-09-19 16:18:23 -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
Thomas Tracy
b0d731b829 Version bump 2019-09-19 15:39:27 -04:00
Ben Holt
5cc8da127a REV-935 mobile upsell and tests (#21687) 
Positive test case and improvements including: requires course id to be correctly encoded in the url params, only checks entitlements of the course in question, better source for the basket url, check enrollment upgrade deadline
 2019-09-19 14:59:07 -04:00
Feanil Patel
9740e2e077 BOM-618 Don't decode string objects. 2019-09-19 14:14:23 -04:00
Feanil Patel
24c0974f78 BOM-619 Fix csv encoding/decoding in management command test. 2019-09-19 14:14:22 -04:00
Jeremy Bowman
ae2c3b8edf Fix mocks of open() - BOM-597 2019-09-19 13:53:37 -04:00
Jansen Kantor
b0f40a111c add requesting_user to simple-history model (#21683) 2019-09-19 13:43:35 -04:00
Nick
01ba7f6f20 Merge pull request #21696 from edx/ndalfonso/DISCO-1342-hide-fields 
DISCO-1342 hide fields
 2019-09-19 12:35:48 -04:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -04:00
Jeremy Bowman
fc57bf9763 Use bytes with GridFS when not specifying an encoding - BOM-157 2019-09-19 11:17:01 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Feanil Patel
3a83760909 Run make upgrade 2019-09-19 11:15:11 -04:00
Awais Qureshi
112a0c7af6 Merge pull request #21694 from edx/awais786/BOM-437 
BOM-437
 2019-09-19 20:03:38 +05:00
Matt Hughes
09d5c87647 Fix bug with override removal conditions 
This was failing to delete overrides stemming from proctoring which
pre-date the corresponding change.

JIRA:PROD-704
 2019-09-19 10:44:18 -04:00