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

20204 Commits

Author SHA1 Message Date
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Diana Huang
f724f5b488 Add courseware migration. 2019-10-02 14:11:15 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
atesker
e07635559c EDUCATOR-4365 - display max score for not started assignment 
pep8

moved includes

refactor 1

correted properties

update unit test

pep update

cr 2

made failure case a function
 2019-10-02 08:48:31 -04:00
Aarif
7be6acb880 Merge pull request #21856 from edx/BOM-851 
BOM-851
 2019-10-02 11:44:45 +05:00
Ned Batchelder
d3a1ca9f69 See if this fancy stack trace was stopping newrelic 2019-10-01 18:04:16 -04:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842 
BOM-842
 2019-10-01 10:37:15 +05:00
Stu Young
8c94ee15ea add missing annotation tokens to course api toggles (#21831) 2019-09-30 14:13:03 -04:00
Awais Qureshi
647527f916 Merge pull request #21852 from edx/awais786/BOM-829 
BOM-829
 2019-09-30 22:26:54 +05:00
Awais Qureshi
59cdc80159 Merge pull request #21847 from edx/awais786/BOM-841 
BOM-841
 2019-09-30 22:24:26 +05:00
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
bb419b485d Python 3: assertEqual(response.content.count -> assertContains(.. 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
d4832a65aa Python 3: assertNotIn -> assertNotContains consistency 2019-09-30 08:50:38 -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
Nimisha Asthagiri
adaf79ff73 Merge pull request #21836 from edx/bom/grades-python-3 
Grades python-3 upgrade: test_recalculate_learner_grades.py
 2019-09-30 08:30:07 -04:00
aarif
bec80bb34b python 3 fixes 2019-09-30 16:02:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Awais Qureshi
c96c172b3a BOM-829 
Python3 fix.
 2019-09-30 15:23:03 +05:00
Awais Qureshi
5c8db66021 BOM-841 
Python3 fix.
 2019-09-30 13:47:50 +05:00
Zainab Amir
b4ca12af33 Notes css is missing for tab pages (#21846) 
style-student-notes is only added in courseware.html but it is missing
for custom tab pages.

PROD-687
 2019-09-30 12:44:10 +05:00
Nimisha Asthagiri
b73e0d8120 Grades python-3 upgrade: test_recalculate_learner_grades.py 2019-09-28 11:39:26 -04:00
Alex Dusenbery
bf77974297 EDUCATOR-4684 | The instructor course grade report should take subsection grade overrides into account. 2019-09-27 11:55:41 -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
Matt Hughes
6085852c99 Attribute grade overrides from proctoring to the final reviewer 
More generally, makes it so we don't ever pull in the user to whom
we're attributing overrides from the request, but always use the one
passed in via method parameters

Also pass through comments, if they're provided via this method

JIRA:EDUCATOR-4641
 2019-09-27 10:58:58 -04: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
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
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
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
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
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
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Ned Batchelder
83406db629 Add more diagnostics to the courseware import warning 2019-09-26 09:13:15 -04: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
adeelehsan
8e2cdc2dad Used smart_str instead of str 2019-09-26 16:28:03 +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
2b3538a6eb BOM-687 
python3 compatibility
 2019-09-26 12:46:47 +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
Joseph Mulloy
f2a599bffb Add dependency on csmhe migration to csm bigint 2019-09-25 15:41:26 -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