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

1801 Commits

Author SHA1 Message Date
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
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
Gabe Mulley
fce9344ddc new relic tracing for ace 2017-10-18 10:29:53 -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
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
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
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
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
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
J. Cliff Dyer
4ab64f76a2 Add BigAutoField for BlockCompletion primary key. 2017-10-17 14:45:49 -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
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
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
Gabe Mulley
71a62f827c use pixel measurements 2017-10-16 22:33:23 -04:00
Gabe Mulley
7ab0f39df0 include upsell messaging in the 10 day nudge emails 2017-10-16 22:22:22 -04: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
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
Mushtaq Ali
538a3d7801 Add video transcript config model flags - EDUCATOR-1224 2017-10-16 19:23:18 +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
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
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
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
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
Nimisha Asthagiri
741917e92b Course Update emails 2017-10-13 10:53:44 -04:00
Robert Raposa
1a66ae368a Fix caching of course_outline_root_block. 
LEARNER-2819
 2017-10-13 10:10:37 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -04:00
Tyler Hallada
d571adfb99 Use upsell_link in upgrade reminder template 2017-10-13 10:01:35 -04:00
sandroroux
fc7c1652f8 Modified criteria for upselling. User must have a dynamic deadline to receive an email with an upsell button 2017-10-13 10:01:35 -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
Douglas Hall
2062dd8629 Fix get_enterprise_customer api cache key. 
ENT-704
 2017-10-13 14:43:12 +05:00
edx-pipeline-bot
17d9336080 Merge pull request #16215 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-12 15:28:25 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Simon Chen
29a1df3323 Revert "Exposing course run license via Course API" 
This reverts commit a1419b15f7.
 2017-10-11 12:37:09 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Andy Armstrong
5ae2bee17f Merge pull request #16119 from edx/hackathon/bootstrap-courseware 
Convert course home page to Bootstrap
 2017-10-11 10:21:13 -04:00
Andy Armstrong
374cdb0a3d Convert course home page to Bootstrap 
LEARNER-1694

Fix a11y failure

Fix header styling

Fix layout issues

Further layout fixes
 2017-10-10 20:18:27 -04:00
Uman Shahzad
2601b26af6 Update mocks/docs/code to reflect Enterprise API updates. 2017-10-11 02:05:04 +05:00