Calen Pennington
4700656980
Move bin-count constants into resolvers.py nearer to the queries that use them
2017-10-24 10:12:46 -04:00
Calen Pennington
31db37eaf9
Move binning queries into resolvers.py to be closer to the Resolvers where they will live
2017-10-24 10:12:36 -04:00
Matt Tuchfarber
63d2607059
Merge pull request #16307 from edx/tuchfarber/fix_program_instructor_dedup
...
Add trim to instructor deduplicator
2017-10-24 09:22:10 -04:00
ayub-khan
790150a8aa
Management Command to Clear DOT expired Tokens
...
LEARNER-717
2017-10-24 16:10:26 +05:00
Nimisha Asthagiri
cd1eaf3010
Dynamic Pacing: Waffle switch
2017-10-23 18:30:36 -04:00
Matt Tuchfarber
7305d6f97d
Add trim to instructor deduplicator
...
Current instructor list on program marketing page has duplicate
professors because they are manually entered and some have trailing
spaces. This fixes that.
2017-10-23 14:50:02 -04:00
Tyler Hallada
5cc73bc7fd
Merge pull request #16276 from edx/thallada/ret-dedupe-upgrade-reminder
...
Send only one upgrade reminder email per user per day
2017-10-23 14:11:45 -04:00
Sanford Student
fd8a9fdb02
EDUCATOR-1511: credit users added to verified user partition irrespective of upgrade deadline
2017-10-23 13:14:47 -04:00
Tyler Hallada
4ab477eaa7
Address Greg's comment
2017-10-23 11:59:27 -04:00
Tyler Hallada
89e7404955
Add copy preceding course list in upgrade reminder
2017-10-19 16:51:07 -04:00
ayub-khan
a71fd68673
Added user logs for save bearer token
...
Purpose of those logs is to get more information
about deadlocks coming on prod when we revoke already
existing refresh tokens.
LEARNER-717
2017-10-20 00:26:18 +05:00
Tyler Hallada
de072f8d24
Update upgrade_reminder template for multi-course
2017-10-19 11:57:41 -04:00
Tyler Hallada
9724843327
Group by user in the upgrade_reminder task
2017-10-19 11:57:40 -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
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
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
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
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
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
