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

8303 Commits

Author SHA1 Message Date
Rabia Iftikhar
b245fa0374 Merge pull request #16159 from edx/ri/EDUCATOR-139-add-charset-webOb-response 
EDUCATOR-139 Add charset to the WebOb response
 2017-10-05 22:42:43 +05:00
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods. 
Mock out the static_replace modules in the proper location.
 2017-10-05 11:12:52 -04:00
rabiaiftikhar
ee558581e2 EDUCATOR-139 Add charset to the WebOb response 2017-10-05 15:36:49 +05:00
Nimisha Asthagiri
b5435e6f5a Course Grade reports: eliminate CSM calls, user-transformed structures 
EDUCATOR-558
 2017-10-05 01:12:49 -04:00
rabia23
ec105008b6 EDUCATOR-139 add log to identify the cause of error 2017-09-28 13:12:21 +00:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Nimisha Asthagiri
083ccdb95a Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch 2017-09-25 16:13:07 -04:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
550c1e0725 Use simpler contract spec to fix parsing error. 2017-09-25 10:33:14 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -04:00
Clinton Blackburn
14b8c12e88 Added Studio API endpoint to update course image 
LEARNER-2468
 2017-09-13 11:22:47 -04:00
M. Rehan
8c37dff1a8 Merge pull request #15475 from OmarIthawi/omar/default-english-transcripts 
Allow displaying videos without transcripts
 2017-09-12 12:22:41 +05:00
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
noraiz-anwar
1203eb5835 Do not override Default Video URL with value from VAL 2017-09-11 17:27:53 +05:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Muzaffar yousaf
f1c574cf63 Merge pull request #15565 from jspayd/caption-centering 
Fix video caption centering
 2017-09-06 17:38:31 +05:00
Jeremy Bowman
32000c7a98 Clean up TestCase subclassing 2017-08-29 15:38:48 -04:00
Noraiz Anwar
03abf94a80 Merge pull request #15916 from edx/revert-15889-mroytman/EDU-1134 
Revert "remove try/catch block and associated test for EDUCATOR-1134"
 2017-08-29 22:47:16 +05:00
Jeremy Bowman
0d7806e0cd Fix tests that depend on execution order 2017-08-29 11:08:47 -04:00
Noraiz Anwar
d13928559a Revert "remove try/catch block and associated test for EDUCATOR-1134 followin…" 2017-08-29 19:43:01 +05:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Michael Roytman
21113eb835 remove try/catch block and associated test for EDUCATOR-1134 following verification that no stage or production courses have issues related to dates 2017-08-23 16:00:51 -04:00
Ned Batchelder
fee0c41ce0 XBlock fields with formatted-in values can now translate properly 2017-08-19 15:37:12 -04:00
Sofiya Semenova
ffd72c1051 Merge pull request #15705 from edx/ssemenova/ed-526 
EDUCATOR-526 Update view certificate button
 2017-08-16 15:52:54 -04:00
Sofiya Semenova
76f1df6b0e EDUCATOR-526 Update view cert button to only appear after availability 
date has passed
 2017-08-15 11:57:28 -07:00
cahrens
b26b41b9fc Replace deprecated_string methods. 2017-08-15 14:21:45 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
cahrens
6446f6111e Log courses with improper end dates. 
EDUCATOR-1134
 2017-08-11 14:37:16 -04:00
cahrens
2135195e17 Force hint notification to take up entire width. 
EDUCATOR-1136
 2017-08-11 11:41:08 -04:00
Christina Roberts
98dd14f21d Merge pull request #15770 from edx/christina/slash-the-slash 
Remove usages of deprecated SlashSeparatedCourseKey.
 2017-08-08 16:36:49 -04:00
cahrens
fd62164563 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-08 12:32:58 -04:00
Christina Roberts
4f5b033c27 Merge pull request #15750 from edx/christina/slash-the-slash 
Remove SlashSeparatedCourseKey from tests
 2017-08-07 15:53:08 -04:00
cahrens
6f71706b17 Remove SlashSeparatedCourseKey from tests. 2017-08-07 14:49:30 -04:00
Giulio Gratta
2ad885b726 Fix attrib check code for library_content import 
Attributes come in as a list of dicts with strings as keys and values.
Implicitly casting each result as a tuple causes the code to split the key string into it's characters.
This yields a list of characters, the first two of which are placed into the variables "attr_name" and "attr_value".
This is not only wrong, but because keys tend to be more than 2 characters, the net result is:

"ValueError: too many values to unpack"
 2017-08-04 10:47:05 -07:00
Jillian Vogel
d0cfa7fa5a Merge pull request #15431 from open-craft/jill/studio-filter-archived-courses 
Separate Archived courses into a separate list in Studio
 2017-08-02 10:42:09 +09:30
Sofiya Semenova
18bd532013 Educator-9 Remove comment 2017-07-27 18:54:51 +00:00
Jillian Vogel
8087a1d165 Adds settings.FEATURES.ENABLE_SEPARATE_ARCHIVED_COURSES 
Separates archived courses into a different tab on the Studio index page.

Data is rendered synchronously, but tests are added to ensure that no new sql
or mongo queries were required.
 2017-07-26 14:44:08 +09:30
Eric Fischer
d4943c5337 Use bulk_operations when loading items 
This has been causing a huge memory leak, wrapping the call in this
context manager properly cleans up the 'records' entries.

EDUCATOR-274
 2017-07-25 12:40:15 -04:00
Eric Fischer
bc6d7980a4 Revert "Merge pull request #15593 from edx/efischer/edu-274_logging" 
This reverts commit 2d6b477e83, reversing
changes made to 7799c4adf4.
 2017-07-25 10:38:29 -04:00
Christina Roberts
eadc099512 Merge pull request #15597 from edx/christina/revert-ed-60 
Restore more specific error messages.
 2017-07-19 11:03:38 -04:00
Eric Fischer
2d6b477e83 Merge pull request #15593 from edx/efischer/edu-274_logging 
Add ActiveBulkThread record logging; CMS memory leak debug
 2017-07-18 15:45:03 -04:00
cahrens
4e3ed8b5c6 Restore more specific error messages. 
EDUCATOR-929
 2017-07-18 15:21:00 -04:00
Eric Fischer
f7613819a0 Add ActiveBulkThread record logging; CMS memory leak debug 2017-07-18 14:56:53 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
edx-pipeline-bot
b97f593402 Merge pull request #15573 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-14 12:56:04 -04:00
muhammad-ammar
edcd64e90f edx-videoi-id strip fix 
LEARNER-1871
 2017-07-14 19:17:16 +05:00
Joshua Spayd
4b733b5657 Fix video caption centering 
Fixes super off-center captions for full screen video with captions on
and transcripts off. Perfects caption centering in general, which was
before a bit off.

Leveraging pre-existing .closed class.
 2017-07-13 21:30:38 +00:00