Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Calen Pennington
0c5d788a9a Convert bin-scheduling tasks into classes 2017-10-24 10:15:30 -04:00
Calen Pennington
4d230d629d Move the core of the bin enumeration code into resolvers.py 2017-10-24 10:15:23 -04:00
Calen Pennington
2e4e479f4f Move get_schedules_with_target_date_by_bin_and_orgs closer to its eventual home 2017-10-24 10:12:52 -04:00
Calen Pennington
bb050381a0 Move async_send_task binding to commands to allow tasks.py to import resolvers.py 2017-10-24 10:12:47 -04:00
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
Matthew Piatetsky
c20c8b21c8 Merge pull request #16313 from edx/LEARNER-2412 
Do not set location cookie for USA and set cookie on top level domain
 2017-10-24 08:34:43 -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
Matthew Piatetsky
e0c739288e Do not set location cookie for USA and set cookie on top level domain 2017-10-23 17:22:37 -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
Jillian Vogel
1b63bd9cd7 Merge pull request #16155 from open-craft/jill/enable_enterprise_integration 
Lets ENABLE_ENTERPRISE_INTEGRATION be configurable
 2017-10-23 20:09:43 +10:30
Eric Fischer
b541dfa3fd Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging" 
This reverts commit a13595352f, reversing
changes made to 68d5fe8922.
 2017-10-20 10:45:40 -04:00
Andy Armstrong
e2612bdccf Merge pull request #16249 from edx/andya/responsive-discussions 
Make the discussion board responsive
 2017-10-19 17:09:47 -04:00
Tyler Hallada
89e7404955 Add copy preceding course list in upgrade reminder 2017-10-19 16:51:07 -04:00
Ayub khan
9c1d2b6bfa Merge pull request #16226 from edx/LEARNER-717 
LEARNER-717 Added logs for discovery
 2017-10-20 01:35:34 +05:00
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
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
Andy Armstrong
d18022bb5d Make the discussion board responsive 
LEARNER-1923
 2017-10-19 14:09:22 -04: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
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
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
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