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

43053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uman Shahzad
b7011ec85c Merge pull request #16199 from edx/mattdrayer/ENT-698 
mattdrayer/ENT-698: Log additional context for SuccessFactors errors.
 2017-10-18 15:01:03 +05:00
Matt Drayer
8e51c69a51 Log additional context for SuccessFactors errors. 2017-10-18 12:41:35 +05:00
Gabe Mulley
02aae86b30 Merge pull request #16244 from edx/fix-flaky-test 
fix flaky throttling test
 2017-10-17 21:48:10 -04:00
Uman Shahzad
0ebeda25b6 Merge pull request #16239 from open-craft/uman/0.52.0 
[ENT-643] Bump edx-enterprise to 0.52.1.
 2017-10-18 06:26:36 +05:00
McKenzie Welter
0375e42d59 Merge pull request #16167 from edx/McKenzieW/course-cert-hours-of-effort 
Flag for Hours of Effort in course certificates
 2017-10-17 18:27:22 -04:00
Braden MacDonald
d64e0b9501 Merge pull request #16047 from open-craft/cliff/block-completion-model 
Block completion model
 2017-10-17 15:06:34 -07:00
McKenzie Welter
39bf59e6d3 Flag for Hours of Effort in course certificates 
Retrieve different data fields from Discovery
 2017-10-17 17:07:54 -04:00
Uman Shahzad
4055cc00cc Bump edx-enterprise to 0.52.1. 2017-10-18 00:50:00 +05:00
Sofiya Semenova
7382fe12aa Merge pull request #16203 from edx/ssemenova/dashboard-cert-info 
Clean up dashboard_certificate_information template.
 2017-10-17 14:50:42 -04:00
J. Cliff Dyer
4ab64f76a2 Add BigAutoField for BlockCompletion primary key. 2017-10-17 14:45:49 -04:00
J. Cliff Dyer
6f89157d62 Introduce BlockCompletion model. 
* Includes custom manager.
* Includes percent validation.
* Includes useful indices.
* Subclasses TimeStampedModel

OC-3086
 2017-10-17 14:35:58 -04:00
Sofiya Semenova
b8d73df5a4 Cleaning up dashboard_certificate_information template. 2017-10-17 13:27:19 -04:00
Tyler Hallada
1dc9b1194f Merge pull request #16209 from edx/thallada/dont-send-emails-after-course-end 
Don't send RET emails after course end
 2017-10-17 10:52:18 -04:00
Troy Sankey
e507dac87c Merge pull request #16247 from edx/pwnage101/avoid_implicit__in_query_PLAT-1525 
Use singular getter function where only one requirement is expected
 2017-10-17 10:43:32 -04:00
Matt Tuchfarber
77c1ca51d8 Merge pull request #16248 from edx/tuchfarber/program_marketing_edits 
Fix program marketing page to assume less (fix 500 error on stage/prod)
 2017-10-17 10:31:26 -04:00
Gabe Mulley
34cc63d993 remove slow and flaky throttling tests 2017-10-17 09:25:22 -04:00
Muzaffar yousaf
1266fbf67a Merge pull request #16253 from edx/fix-quality-voilation 
Fix quality issues to get green build for master.
 2017-10-17 17:32:12 +05:00
muzaffaryousaf
ef8b2994cc Fix quality issues to get green build for master. 2017-10-17 16:33:58 +05:00
Muzaffar yousaf
b34b5d9a12 Merge pull request #15872 from edx/video-transcript-preferences 
Video transcript preferences
 2017-10-17 14:45:29 +05:00
Waheed Ahmed
f520f9bd4e Merge pull request #16202 from edx/waheed/LEARNER-2769-course-dates-web-fragment 
Course dates web fragment for mobile apps.
 2017-10-17 14:29:08 +05:00
Waheed Ahmed
202f190104 Course dates web fragment for mobile apps. 
Implement a course dates fragment as a web view, currently we are using
the course info page to get the course dates section by parsing the
whole html page.

LEARNER-2769
 2017-10-17 13:09:38 +05:00
Troy Sankey
2eba1b5122 Use singular getter function where only one requirement is expected 
This avoids a fatal error in Django 1.9+ in most scenarios, where this
code (before this commit) will no longer result in an implicit __in
query.  This commit should be a no-op functionally for Django 1.8.

More info: https://code.djangoproject.com/ticket/25284

PLAT-1525
 2017-10-16 17:35:32 -04:00
Tyler Hallada
1c8fcf218a Fix tests 2017-10-16 16:15:10 -04:00
Matt Tuchfarber
17dd47bf76 Assume less perfect data 2017-10-16 15:46:10 -04:00
Andy Armstrong
80126fc79f Merge pull request #16232 from edx/andya/bootstrap-support-modal 
Make the support modal responsive
 2017-10-16 14:39:51 -04:00
Andy Armstrong
fb820f9b25 Merge pull request #16211 from edx/andya/further-stylelint-fixes 
More Sass quality fixes
 2017-10-16 14:39:21 -04:00
edx-pipeline-bot
c011e7134d Merge pull request #16243 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-16 14:14:37 -04:00
Andy Armstrong
af4d419824 Make the support modal responsive 
LEARNER-142
 2017-10-16 13:33:50 -04:00
Gabe Mulley
7d6aa950e9 fix flaky throttling test 2017-10-16 12:46:00 -04:00
Andy Armstrong
bd1a0d96cf More Sass quality fixes 2017-10-16 12:41:20 -04:00
Gabe Mulley
4a13f9bf53 ACE writes to a file by default 2017-10-16 12:17:25 -04:00
Tyler Hallada
bf95f2371c Standardize on var names: *_datetime and *_day 2017-10-16 11:33:45 -04:00
Tyler Hallada
3c250e5649 Address Gabe's comments 2017-10-16 11:12:19 -04:00
Tyler Hallada
5bfb322f1e Don't send RET emails after course end 2017-10-16 11:11:16 -04:00
muzaffaryousaf
d4147e7d37 Update edx-val dependency. 2017-10-16 19:23:39 +05:00
Qubad786
d6acfa679f Add video source language support for Cielo24 - EDUCATOR-1491 2017-10-16 19:23:19 +05:00
Mushtaq Ali
c0b5932d72 Source video language UI - EDUCATOR-1314 2017-10-16 19:23:19 +05:00
Qubad786
5900b349bc Backend changes for video source language in transcript preferences. 2017-10-16 19:23:19 +05:00
Qubad786
9c06bb65b1 Use edx-val transcripts and translations collectively with contentstore. 
Adds val trancripts in outcome of get_transcripts_info and rest of flow remains the same and also add fallback  to edx-val rtanscripts for mobile accessible video endpoints.
 2017-10-16 19:23:18 +05:00
Qubad786
ec7b78d60e Use edx-val transcripts as a fallback on the video component 
Purpose of this, is to serve transcripts from edx-val if the requested transcripts are not found in the contentstore i.e. that's where all the transcripts are living to date.
 2017-10-16 19:23:18 +05:00
muhammad-ammar
845bb7b884 transcript import export 
EDUCATOR-1216
 2017-10-16 19:23:18 +05:00
Mushtaq Ali
538a3d7801 Add video transcript config model flags - EDUCATOR-1224 2017-10-16 19:23:18 +05:00
muhammad-ammar
2203de4a85 video ids info 2017-10-16 19:23:17 +05:00
Mushtaq Ali
17e87f87ec Change transcript status text - EDUCATOR-1324 2017-10-16 19:23:17 +05:00
Mushtaq Ali
9d156c042c Remove course wide transcript settings (N/A provider selected) - EDUCATOR-1311 2017-10-16 19:23:15 +05:00
Mushtaq Ali
ec399645f3 Course video settings UI - EDUCATOR-1063 2017-10-16 19:22:41 +05:00
Qubad786
9009669cc7 Add trasncript preferences backend for studio and new transcription statuses to video. 
EDU-1092
 2017-10-16 19:22:41 +05:00
muzaffaryousaf
a953a844fd Settings for video transcripts bucket w.r.t django storages. 2017-10-16 19:22:41 +05:00
John Eskew
df47204441 Merge pull request #16241 from edx/jeskew/add_django_simple_history_back_to_rc_reqs 
Add django-simple-history back to edx-platform as a requirement.
 2017-10-16 09:45:30 -04:00
John Eskew
1f36bf0876 Add django-simple-history back to edx-platform as a requirement. 
The module is still used by (at least) edx-enterprise.
 2017-10-16 09:42:22 -04:00