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

43095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Filler
dc99968c4a Merge pull request #16277 from edx/bfiller/WL-1279 
Pass course name to data sharing consent declined template
 2017-10-19 15:53:17 -04:00
Bill Filler
9ed51381f3 Pass course name to template 
WL-1279
 2017-10-19 15:51:39 -04:00
Ayub khan
c739f59ea9 Merge pull request #16284 from edx/you/update_translations 
Update translations (autogenerated message)
 2017-10-20 00:15:55 +05:00
Sven Marnach
b754ad59ca Unconditionally include the wrapper div for the visibility message. 2017-10-19 14:24:58 -04:00
Sven Marnach
4837b6eb65 Link "Topic Area" dropdown to the visibility message via aria-describedby. 2017-10-19 14:24:58 -04:00
Douglas Cerna
49a13216a4 Fixed JS tests 2017-10-19 14:24:58 -04:00
Douglas Cerna
68714d9e97 Fixed quality errors 2017-10-19 14:24:58 -04: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
Gabe Mulley
a13595352f Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging 
Change upgrade deadline messaging
 2017-10-19 13:16:35 -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
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
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
Noraiz Anwar
b5e66f6e90 Merge pull request #16173 from edx/noraiz/EDUCATOR-1424 
use CourseSummary for course listing on studio for non-global staff users
 2017-10-19 13:36:35 +05:00
noraiz-anwar
cb3f858464 use CourseSummary for course listing on studio for non-global staff users 2017-10-19 12:14:35 +05: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
725edbbc7b Merge pull request #16269 from edx/jmbowman/PLAT-1555 
PLAT-1555 Stop using deprecated TEST_* DB setting keys
 2017-10-18 16:03:10 -04:00
David Ormsbee
b87ab764df Separate SectionDescriptor and add highlights field. 2017-10-18 15:54:33 -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
sanfordstudent
d4ff8c1597 Merge pull request #16254 from edx/sstudent/EDUCATOR-1511 
add logging for EDUCATOR-1511
 2017-10-18 09:19:02 -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
c35ab5c9ae Merge pull request #16259 from open-craft/uman/0.52.2 
[ENT-685] Bump edx-enterprise to 0.52.2.
 2017-10-18 17:37:55 +05:00
Gabe Mulley
9c63d1f338 Merge pull request #16251 from edx/include-upsell-in-10-day 
include upsell messaging in the 10 day nudge emails
 2017-10-18 08:37:41 -04:00
Uman Shahzad
80084bb295 Bump edx-enterprise to 0.52.2. 2017-10-18 16:09:11 +05: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
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
bmedx
763fa4de99 Remove empty models.py files 2017-10-17 16:21:21 -04:00
Uman Shahzad
4055cc00cc Bump edx-enterprise to 0.52.1. 2017-10-18 00:50:00 +05: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
Sanford Student
5c90b786fe add logging for EDUCATOR-1511 2017-10-17 15:09:15 -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