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

51581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Ayub khan
2b3538a6eb BOM-687 
python3 compatibility
 2019-09-26 12:46:47 +05:00
Aarif
6f1c05e28c Merge pull request #21744 from edx/BOM-645 
BOM-645
 2019-09-26 12:36:00 +05:00
Aarif
37b08c5784 Merge pull request #21745 from edx/BOM-610 
BOM-610
 2019-09-26 12:35:24 +05:00
Aarif
53e6f7ce8d Merge pull request #21757 from edx/BOM-531 
BOM-531
 2019-09-26 12:34:40 +05:00
Ayub
732e57ddde Merge pull request #21640 from edx/BOM-135 
BOM-135
 2019-09-26 11:55:22 +05:00
Ayub khan
4ae88b1bee BOM-135 
fixed all failing tests for the file.
 2019-09-26 11:23:57 +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
Samuel Walladge
518060fc51 Include djangoapps.heartbeat by default 
If this isn't installed, the sample_task provided by
openedx.core.djangoapps.heartbeat isn't imported, and thus are never
registered with the celery workers.  This sample_task is used for the
extended heartbeat api call. Since the celery heartbeat check is turned
on by default, we should also make sure this djangoapp and thus
sample_task is registered by default. Otherwise the extended heartbeat
check fails with the default configuration.
 2019-09-26 11:13:43 +09:30
edX Transifex Bot
89960f726c geoip2: update maxmind geolite country database 2019-09-25 17:08:27 -04:00
Joseph Mulloy
348550957b Merge pull request #21718 from edx/jdmulloy/fix_devstack_migrations 
Add dependency on csmhe migration to csm bigint
 2019-09-25 16:29:10 -04:00
Joseph Mulloy
f2a599bffb Add dependency on csmhe migration to csm bigint 2019-09-25 15:41:26 -04:00
Alex Dusenbery
30655847f9 Upgrade django-user-tasks==0.2.1 2019-09-25 15:22:01 -04: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
Cory Lee
0befab339b Always run CSMH migrations in all contexts (#21776) 
* Always run CSMHE migrations for every application in all contexts
 2019-09-25 13:27:26 -04:00
Jeremy Bowman
dab59635a7 Fix some failing xmodule tests (#21775) 2019-09-25 12:01:27 -04:00
Jeremy Bowman
8828efc060 Fix test collection under py35 BOM-615 (#21774) 2019-09-25 11:20:21 -04:00
David Ormsbee
605674f766 Merge pull request #21690 from open-craft/blockstore-libraries-events 
Track grades for Blockstore content, emit tracking logs
 2019-09-25 11:05:10 -04:00
Chris Pappas
918b70f9a1 ENT-2294 | Removing wrapper api in program_enrollments app that edx-enterprise will no longer use (#21763) 2019-09-25 10:55:43 -04:00
Braden MacDonald
8a2d499dd2 Track grades for Blockstore content, emit tracking logs 2019-09-25 10:42:55 -04:00
edX cache uploader bot
17a8d57699 Updating Bokchoy testing database cache (#21772) 2019-09-25 10:21:41 -04:00
Diana Huang
9ecbbf6801 Merge pull request #21457 from edx/diana/remove-shoppingcart-pdf 
Remove shoppingcart pdf generation.
 2019-09-25 10:06:17 -04:00
aarif
00f42fbd9a python 3 fixes 
python 3 fixes

python 3 fixes

python 3 fixes

minor changes
 2019-09-25 18:47:37 +05:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Diana Huang
e80265bb9a Remove shoppingcart pdf generation. 
DEPR-40
 2019-09-25 09:07:09 -04:00
edX requirements bot
1cc925b624 Updating Python Requirements (#21771) 2019-09-25 09:06:00 -04:00
Ayub
6428797366 Merge pull request #21707 from edx/BOM-679 
BOM-679
 2019-09-25 17:11:56 +05:00
Aarif
4e95024dc3 Merge pull request #21525 from edx/BOM-367 
BOM-367 Python 3 fixes
 2019-09-25 16:07:44 +05:00
Aarif
22992029f8 Merge pull request #21755 from edx/BOM-658 
BOM-658
 2019-09-25 15:19:01 +05:00
Aarif
43ebcc3dab Merge pull request #21758 from edx/BOM-407 
BOM-407
 2019-09-25 15:14:09 +05:00
aarif
736001e7f1 python 3 fixes 
quality fixes

python 3 fixes
 2019-09-25 15:10:50 +05:00
Aarif
5f3b5d6110 Merge pull request #21748 from edx/BOM-586 
BOM-586
 2019-09-25 14:55:12 +05:00
Ayub khan
22c6d45d90 BOM-679 
Request object was mocked but mocked value was never assigned.
In py2 moked object call is always successful. But in py3 if
value is not properly assigned it returns None. Causing the test
to fail. Removing the mocked object also fails the test so
removing it as broken test.
 2019-09-25 14:47:28 +05:00