Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
Andy Armstrong
d18022bb5d Make the discussion board responsive 
LEARNER-1923
 2017-10-19 14:09:22 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -04:00
David Ormsbee
68d5fe8922 Merge pull request #16264 from edx/ormsbee/section_summaries2 
Separate SectionDescriptor and add summary field.
 2017-10-19 09:46:16 -04:00
noraiz-anwar
cb3f858464 use CourseSummary for course listing on studio for non-global staff users 2017-10-19 12:14:35 +05:00
Jillian Vogel
425239a509 Disables Enterprise Integration feature by default 
Moves ENABLE_ENTERPRISE_INTEGRATION to settings.FEATURES,
and changes the default value to False.
 2017-10-19 15:58:13 +10:30
David Ormsbee
b87ab764df Separate SectionDescriptor and add highlights field. 2017-10-18 15:54:33 -04:00
John Eskew
e28932c74a Merge pull request #16262 from edx/jeskew/fix_historical_deletion_mgmt_cmd 
Fixes to mgmt cmds which delete django-simple-history data.
 2017-10-18 10:30:46 -04:00
Brian Mesick
9e91d3d0be Merge pull request #16070 from edx/bmedx/settings_tuple_to_list_PLAT-1530 
Change Django settings from tuples to lists to prep for 1.11 upgrade
 2017-10-18 09:20:14 -04:00
John Eskew
41aaaab584 Fixes to mgmt cmds which delete django-simple-history data. 2017-10-18 09:15:37 -04:00
Brian Mesick
ba4c6ca2aa Merge pull request #16256 from edx/bmedx/django111_models_and_migrations_cleanup 
Remove empty models.py files
 2017-10-18 09:03:32 -04:00
John Eskew
eb99657770 Merge pull request #16220 from edx/jeskew/delete_historical_data 
Mgmt commands to clear data from historical tables.
 2017-10-18 09:00:21 -04:00
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
bmedx
763fa4de99 Remove empty models.py files 2017-10-17 16:21:21 -04:00
John Eskew
f3e089bd3f Mgmt commands to clear data from historical tables. 2017-10-17 15:27:59 -04: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
Sofiya Semenova
b8d73df5a4 Cleaning up dashboard_certificate_information template. 2017-10-17 13:27:19 -04:00
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -04:00
Gabe Mulley
34cc63d993 remove slow and flaky throttling tests 2017-10-17 09:25:22 -04: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
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
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
muhammad-ammar
2203de4a85 video ids info 2017-10-16 19:23:17 +05:00
Josh McLaughlin
4c3ea0797c Fix regex to check for HTML5 video urls which contain parameters 2017-10-16 19:21:05 +09: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
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
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
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
Nimisha Asthagiri
741917e92b Course Update emails 2017-10-13 10:53:44 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -04:00
Calen Pennington
8468357ac4 Separate the date and link logic out of VerifiedUpgradeDeadlineBlock, so that it can be called directly with prefetched data for check_and_get_upgrade_link_and_date 2017-10-13 10:01:34 -04:00
George Song
2605bf99b6 Merge pull request #15700 from mitodl/aq_unicode_issue_capa 
Fixed problem with non-Latin characters in loncapa/python problems
 2017-10-13 04:59:21 -07:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
AsadAzam
a9d68c32c0 Merge pull request #16160 from edx/asad/educator-1427-problem-rescore 
Fixed score update on rescore
 2017-10-12 14:32:22 +05:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Robert Raposa
344e13b1ce Merge pull request #16179 from edx/robrap/refactor-site-enrollment-filter 
Refactor site course enrollment filtering.
 2017-10-11 14:10:08 -04:00
Asad Azam
cde6f4b773 Fixed score update on rescore 2017-10-11 23:03:04 +05:00
Robert Raposa
112938e4ac Refactor site course enrollment filtering. 2017-10-11 12:21:42 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Douglas Hall
612d962962 Merge pull request #16196 from edx/douglashall/update_enterprise_0_51_2 
Updating edx-enterprise to 0.51.3.
 2017-10-11 10:37:39 -04:00
Feanil Patel
69d5239678 Merge pull request #16108 from open-craft/haikuginger/install-extra-middleware 
Add middleware classes dynamically from configuration
 2017-10-11 10:22:49 -04:00
Jesse Shapiro
c4767e253b Add middleware classes dynamically from configuration and switch MIDDLEWARE_CLASSES to use a list 2017-10-11 09:16:41 -04:00
Douglas Hall
ca903278f5 Updating edx-enterprise to 0.51.2. 
https://github.com/edx/edx-enterprise/compare/0.51.0...0.51.2
 2017-10-11 08:47:50 -04:00