Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ayub khan
476da01f36 BOM-612 
python3 compatibility
 2019-09-26 15:22:22 +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
1793de5cbb python 3 fixes 
test fixes

python 3 fixes

test fixes

test fixes

quality fix

python 3 fixes

minor fixes
 2019-09-26 14:50:14 +05:00
Ayub khan
d1ff659942 BOM-671 
python3 compatibility
 2019-09-26 14:26:05 +05:00
aarif
66942bc74c python 3 fixes 
python 3 fixes

python 3 fixes
 2019-09-26 14:19:18 +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 khan
1178384a52 BOM-608 
python3 compatibility
 2019-09-26 12:28:23 +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