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

16999 Commits

Author SHA1 Message Date
Ayub khan
c739f59ea9 Merge pull request #16284 from edx/you/update_translations 
Update translations (autogenerated message)
 2017-10-20 00:15:55 +05:00
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
ayub-khan
3032de0251 Update translations (autogenerated message) 2017-10-19 23:18:25 +05:00
Brittney Exline
40f37608fa Merge pull request #16265 from edx/bexline/data_passback 
ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET
 2017-10-19 14:01:28 -04:00
Brittney Exline
23640d0019 ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET 2017-10-19 12:24:05 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -04:00
Matt Tuchfarber
b5ddcb3950 Merge pull request #16263 from edx/tuchfarber/program_marketing_fix 
Fix program marketing page when it doesn't have a video.
 2017-10-19 09:18:48 -04:00
Harry Rein
8c8edd2c80 Merge pull request #16274 from edx/HarryRein/LEARNER-2860-goals-styling-fixes 
Orders course goals and updates styling.
 2017-10-19 09:16:12 -04:00
Harry Rein
ec17971a2b Orders course goals and updates styling. 
LEARNER-2860
 2017-10-18 16:57:57 -04:00
Matt Tuchfarber
75e3845dad Fix issue where program doesn't have video 
I wrongly assumed a video field wouldn't exist on a program
that doesn't include a video. Since it exists and is set to null
this fixes the retrieval of the source url.
 2017-10-18 16:56:00 -04:00
Jeremy Bowman
bda84d526b PLAT-1555 Stop using deprecated TEST_* DB setting keys 2017-10-18 14:17:09 -04:00
sanfordstudent
13f3b496a2 Merge pull request #16266 from edx/aed/EDUCATOR-1428 
EDUCATOR-1428 | Add time_limit to course/subsection grading tasks.
 2017-10-18 13:33:52 -04:00
Gabe Mulley
3ed43c9456 Merge pull request #16261 from edx/newrelic-tracing-ace 
Add custom new relic tracing to ACE tasks
 2017-10-18 11:31:49 -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
Gabe Mulley
fce9344ddc new relic tracing for ace 2017-10-18 10:29:53 -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
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
bmedx
763fa4de99 Remove empty models.py files 2017-10-17 16:21:21 -04:00
Alex Dusenbery
1ea419c2c4 EDUCATOR-1428 | Add time_limit to course/subsection grading tasks. 2017-10-17 15:28:01 -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
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
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -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
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
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
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
muzaffaryousaf
a953a844fd Settings for video transcripts bucket w.r.t django storages. 2017-10-16 19:22:41 +05: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
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
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
946421c438 Rebuild program marketing page in Bootstrap and make it look similar 
to the Micromasters page
 2017-10-13 13:11:39 -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