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

43034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Douglas Hall
6387e3a813 Merge pull request #16225 from edx/asadiqbal08/ENT-694 
Enterprise- Version bumped to 0.51.5
 2017-10-16 09:17:43 -04:00
Waheed Ahmed
158abee9cb Merge pull request #16228 from edx/waheed/LEARNER-2828-fix-frontend-email-regex-on-login 
Fix frontend email regex for login page.
 2017-10-16 16:17:00 +05:00
Waheed Ahmed
a1da105d07 Fix frontend email regex for login page. 
Currently we are using Django 1.4 regex for email validation which
does not allow custom domains (e.g. eclo.solutions), fixed it with
latest Django 1.11 regex.

LEARNER-2828
 2017-10-16 12:48:13 +05:00
Aamish Baloch
02ab4a0364 Merge pull request #16146 from edx/aamishbaloch/YONK-776 
YONK-776: added thread_followed and thread_unfollowed signals
 2017-10-16 11:54:49 +05:00
John Eskew
4a1e8af7cf Merge pull request #16236 from edx/jeskew/add_missing_tox_req_files 
Add edx-private and sandbox req files to tox env.
 2017-10-14 10:54:06 -04:00
Nimisha Asthagiri
43c7a5171f Merge pull request #16219 from edx/ret/dynamic-pacing-email 
Course Update emails (initial)
 2017-10-13 17:28:36 -04:00
John Eskew
8bd17fc6a9 Add edx-private and sandbox req files to tox env. 2017-10-13 17:19:21 -04:00
Tyler Hallada
f0ee9ee894 Merge pull request #16222 from edx/thallada/remove-old-recurring-nudge-task 
Delete old recurring_nudge_schedules_for_hour task
 2017-10-13 16:24:26 -04:00
edx-pipeline-bot
a7888b7829 Merge pull request #16231 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-13 15:28:19 -04:00
Alex Dusenbery
b89e6419a5 Prevent compute_all_grades_for_course() task from being executed more than once every hour. 2017-10-13 15:13:53 -04:00
Tyler Hallada
642a9b82b2 Delete old recurring_nudge_schedules_for_hour task 2017-10-13 14:20:11 -04:00
Adam
3fd499b40c Merge pull request #16133 from edx/adam/fix-cg-bug 
address coursegraph issue where components had the same block id but …
 2017-10-13 13:59:10 -04:00
Michael LoTurco
12e09d1c2e Merge pull request #16185 from edx/MLoTurco/learner-1996 
Adding spanish certificate template partials learner-1996
 2017-10-13 13:42:09 -04:00
John Eskew
e7f288882d Merge pull request #16188 from edx/jeskew/remove_django_simple_history 
Remove all usage of the django-simple-history module.
 2017-10-13 13:22:52 -04:00
Matt Tuchfarber
3f7d8bc9b4 Merge pull request #16187 from edx/tuchfarber/program_marketing 
Rewrite program marketing page to use Bootstrap and change design to look more like other marketing design
 2017-10-13 13:12:51 -04:00
Matt Tuchfarber
946421c438 Rebuild program marketing page in Bootstrap and make it look similar 
to the Micromasters page
 2017-10-13 13:11:39 -04:00
Douglas Hall
d5e9e66593 Merge pull request #16230 from edx/douglashall/hotfix_10_13_2017 
Fix get_enterprise_customer api cache key.
 2017-10-13 11:56:31 -04:00
Calen Pennington
12e1af275a Merge pull request #16092 from edx/upsell-nudges-for-unverified-users 
Upsell nudges for unverified users
 2017-10-13 11:32:29 -04:00
Robert Raposa
92318ccc0f Merge pull request #16217 from edx/robrap/fix-outline-caching 
LEARNER-2819: Fix caching of course_outline_root_block.
 2017-10-13 11:19:04 -04:00