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

51623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX requirements bot
a91fcfceed Updating Python Requirements (#21807) 2019-09-27 10:04:44 -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
Hassan
41c8477b62 Merge pull request #21813 from edx/hassan/remove-management-commands 
Removed one-off management commands.
 2019-09-27 18:53:54 +05:00
Hassan Javeed
8ad77f7f0c Removed one-off management commands. 2019-09-27 18:04:16 +05:00
Ben Holt
2d215cccb8 REV-935 More upsell API tests (#21765) 
Check course start and end dates, better test coverage
 2019-09-27 08:57:27 -04:00
Awais Qureshi
22d5273994 Merge pull request #21754 from edx/awais786/BOM-593 
BOM-593
 2019-09-27 16:22:20 +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
Syed Muhammad Dawoud Sheraz Ali
47f8735078 Merge pull request #21617 from edx/dsheraz/prod-62 
Add transformer for re-writing video urls in course api
 2019-09-27 15:43:43 +05:00
Aarif
2dee4dff37 Merge pull request #21747 from edx/BOM-595 
BOM-595
 2019-09-27 14:51:21 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742 
BOM-742
 2019-09-27 14:49:45 +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
Aarif
177b8ab60a Merge pull request #21623 from edx/BOM-421 
BOM-421
 2019-09-27 14:46:35 +05:00
DawoudSheraz
942c79e606 add video url transformer 2019-09-27 14:26:52 +05:00
Awais Jibran
007dfa5c55 Merge pull request #21750 from edx/aj/prevent-unicode-error 
Prevent unicode error
 2019-09-27 13:25:10 +05:00
Ayub
93386c8947 Merge pull request #21786 from edx/BOM-671 
BOM-671
 2019-09-27 09:45:45 +05:00
Ayub
290caa4c8e Merge pull request #21788 from edx/BOM-612 
BOM-612
 2019-09-27 09:44:44 +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
Jeremy Bowman
1e3d6f6db3 Fix parsing of Unicode capa XML BOM-611 (#21803) 2019-09-26 16:34:35 -04:00
Feanil Patel
a847620e88 Merge pull request #21797 from edx/feanil/fix_xmodule_format_failure 
Division changed in python3 to produce floats even when you divide tw…
 2019-09-26 15:49:25 -04:00
Andytr1
a375ce4aac Merge pull request #21799 from edx/andytr1/get_history-from-simple 
EDUCATOR-4696 readded get_history
 2019-09-26 14:59:44 -04:00
atesker
6c6a0e47af fixed for production - add get_history 
EDUCATOR-4696 - put back get_history and update UI

add pylint
 2019-09-26 14:35:20 -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
Jeremy Bowman
4babc5ee1c Fix CorruptGridFile in Python 3 tests BOM-375 (#21794) 2019-09-26 13:43:26 -04:00
Uzair Rasheed
eb8bb72123 Merge pull request #21769 from edx/PROD-663/nulltranslations-attribute-error 
NullTranslations object doesn't have ugettext attribute
 2019-09-26 22:23:25 +05:00
Feanil Patel
093e5a543a Division changed in python3 to produce floats even when you divide two ints. 2019-09-26 13:23:15 -04:00
David Ormsbee
21aca9ccb8 Merge pull request #21633 from open-craft/samuel/celery-fix 
SE-1463 add djangoapps.heartbeat to INSTALLED_APPS by default
 2019-09-26 13:19:44 -04:00
Manjinder Singh
61015ad840 Merge pull request #21779 from edx/msingh/python3_test_shuffle_custom_names 
BOM-614: AssertionError: Lists differ Fix.
 2019-09-26 13:13:53 -04:00
uzairr
a35b452877 NullTranslations object doesn't have ugettext attribute 
Some of the tests are failing because NullTranslations object is
behaving differently with py2 and py3.With py2, it has 'ugettext'
attribute but with py3 it doesn't have.To make it compliant with
both versions modifications in the tests have been added so that
build will not fail.

PROD-663
 2019-09-26 21:37:38 +05: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
bcc09a0148 Use edx-sga that has also been fixed 2019-09-26 10:53:55 -04:00
Ned Batchelder
ef192243e2 Fix one XSS linter issue 2019-09-26 10:53:55 -04:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Dave St.Germain
26026782b0 Merge pull request #21538 from edx/dcs/component-tweaks 
Studio Component Editor Tweaks
 2019-09-26 10:05:23 -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
Dave St.Germain
ea3232feac TNL-6920 Component Editor Efficiency Improvements 
* Enlarges component modal for easier editing
* Allows display name to be edited in place
* Improves markdown button labeling
* Moves markdown cheatsheet to the edit modal, for quick reference
 2019-09-26 09:34:14 -04:00
Ned Batchelder
83406db629 Add more diagnostics to the courseware import warning 2019-09-26 09:13:15 -04:00
aarif
eb694a71b8 python 3 fixes 2019-09-26 18:08:06 +05:00
Aarif
0125bd40c8 Merge pull request #21749 from edx/BOM-532 
BOM-532
 2019-09-26 18:03:43 +05:00
adeelehsan
609fe8632c Merge pull request #21777 from edx/aehsan/prod-707/fixed_encoding_error 
Used encode instead of str
 2019-09-26 18:01:25 +05:00
noraiz-anwar
67af4b8eb1 fix course import issue 2019-09-26 18:00:21 +05:00
jinder1s
7a2aaa09c1 random.shuffle compatibility fix between python 2.7 and 3.5 2019-09-26 08:47:18 -04: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
adeelehsan
8e2cdc2dad Used smart_str instead of str 2019-09-26 16:28:03 +05:00
aarif
f39e6c5914 minor fixes 2019-09-26 16:18:31 +05:00
aarif
7eef705bbe python 3 fixes 
minor fixes
 2019-09-26 15:42:07 +05:00
Ayub
3c02969a99 Merge pull request #21785 from edx/BOM-687 
BOM-687
 2019-09-26 15:26:38 +05:00