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

43210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
eb3e173dc8 Schedules: Course Update support bulleted highlights 2017-10-25 17:57:43 -04:00
Nimisha Asthagiri
d3dcca2f49 Schedules: DRY upsell and CTA in templates 2017-10-25 17:57:43 -04:00
Waheed Ahmed
892c5af871 Merge pull request #16323 from edx/waheed/LEARNER-2951-fix-unicode-error 
Fix unicode error on financial assistance page.
 2017-10-25 18:38:57 +05:00
Waheed Ahmed
8c0e87ab65 Fix unicode error on financial assistance page. 
If country name has special character str() raises unicode error.

LEARNER-2951
 2017-10-25 17:27:46 +05:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
Tasawer Nawaz
aa980554c9 Merge pull request #16240 from edx/tasawer/learner-2804/add-reactjs-for-single-support-form 
add reactjs for single support form
 2017-10-25 12:13:24 +05:00
tasawernawaz
d839d17714 update css and html/ add basics for react 
LEARNER-2804
 2017-10-25 11:12:26 +05:00
Matthew Piatetsky
168b6b36c3 Merge pull request #16332 from edx/LEARNER-2412 
Only convert price to local currency after document is ready
 2017-10-25 00:41:34 -04:00
Matthew Piatetsky
f015682d5d Only convert price to local currency after document is ready 2017-10-24 22:41:22 -04:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
c12923838f Merge pull request #16327 from edx/mulby/upgrade-reminders-fix 
Only send upgrade reminders to learners who are eligible to upgrade
 2017-10-24 18:26:36 -04:00
Douglas Hall
9569e6ee39 Merge pull request #16331 from edx/douglashall/update_edx_enterprise_0_53_1 
Updating edx-enterprise requirement to 0.53.1.
 2017-10-24 15:21:30 -04:00
Gabe Mulley
9e16ed1cac only send upgrade reminders to learners who are eligible 2017-10-24 15:09:03 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Stu Young
c3216acd55 Merge pull request #16308 from edx/estute/add-django-version-to-paver-args 
set django version in paver args
 2017-10-24 14:46:25 -04:00
Douglas Hall
97bb6a344b Updating edx-enterprise requirement to 0.53.1. 
https://github.com/edx/edx-enterprise/compare/0.53.0...0.53.1
 2017-10-24 14:19:26 -04:00
Douglas Hall
c498c1cec1 Merge pull request #16330 from open-craft/uman/0.53.0 
[ENT-432] Bump edx-enterprise to 0.53.0.
 2017-10-24 14:18:38 -04:00
Gabe Mulley
410fbfd11e Merge pull request #16324 from edx/mulby/fix-unresolved-var 
fix malformed template variable
 2017-10-24 13:55:24 -04:00
Gabe Mulley
7efa805fbc fix tests 2017-10-24 13:51:22 -04:00
Douglas Hall
6d4e34bbf2 Merge pull request #16329 from edx/revert-16226-LEARNER-717 
Revert "LEARNER-717 Added logs for discovery"
 2017-10-24 13:03:43 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Uman Shahzad
0084b3b4ae Merge pull request #16303 from open-craft/uman/ent-tagline-logistration 
[ENT-671] Show the Enterprise tagline on the logistration page.
 2017-10-24 21:01:45 +05:00
Uman Shahzad
26d22ea154 Bump edx-enterprise to 0.53.0. 2017-10-24 20:51:29 +05:00
Douglas Hall
f0b41fea5a Revert "LEARNER-717 Added logs for discovery" 2017-10-24 11:38:43 -04:00
Calen Pennington
88d2ff24cd Merge pull request #16293 from edx/cale/refactor-upgrade-email-resolvers 
Cale/refactor upgrade email resolvers
 2017-10-24 11:33:19 -04:00
Alex Dusenbery
5cf016cf5b EDUCATOR-1570 | Wire up a stub signal receiver to handle comment_created signals. 2017-10-24 11:32:07 -04:00
Gabe Mulley
f90f4276f9 fix course sock for courses without verified modes 2017-10-24 11:18:36 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00
Uman Shahzad
0a726a4679 Show the Enterprise tagline on the logistration page. 2017-10-24 20:12:27 +05:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Gabe Mulley
59e173de47 fix malformed template variable 2017-10-24 10:21:48 -04:00
Gabe Mulley
58bff7ed8c update docstrings, DRY up schedules_for_bin 2017-10-24 10:15:41 -04:00
Calen Pennington
1accff9b78 DRY up more of tasks.py code 2017-10-24 10:15:40 -04:00
Calen Pennington
887191b1b3 Pull template context generation out of inside loop 2017-10-24 10:15:40 -04:00
Calen Pennington
dc3c79124b Clean up errant leftover imports 2017-10-24 10:15:39 -04:00
Calen Pennington
9e00f9275e Move MessageType definitions into message_types.py 2017-10-24 10:15:39 -04:00
Calen Pennington
65a740e52f Make SendEmailBaseCommand.send_emails raise NotImplementedError 2017-10-24 10:15:39 -04:00
Calen Pennington
c19a3368f0 Move MessageType definitions into tasks.py 2017-10-24 10:15:38 -04:00
Calen Pennington
e81931da32 Move get_schedules_with_target_date_by_bin_and_orgs into Resolver baseclass 2017-10-24 10:15:38 -04:00
Calen Pennington
234780f5c9 Move Resolver.send into baseclass 2017-10-24 10:15:37 -04:00
Calen Pennington
33a50cf899 Rename schedule_bin to send to match standard Resolver terminology 2017-10-24 10:15:37 -04:00
Calen Pennington
b9643e9d1d Move MessageType instantiation out of Resolvers into Tasks 2017-10-24 10:15:37 -04:00
Calen Pennington
f0fd40421b Use SiteConfigurationFactory a bit more idiomatically 2017-10-24 10:15:36 -04:00
Calen Pennington
5dd172b3d0 Use consistent beginning_of_day function 2017-10-24 10:15:36 -04:00
Calen Pennington
eff9c9c9ab Move common attributes into Resolver.__init__ 2017-10-24 10:15:36 -04:00
Calen Pennington
27fd73ac37 Move datetime deserialization out of Resolver.schedule_bin 2017-10-24 10:15:35 -04:00
Calen Pennington
ec3ebafbc1 Pass an instantiated Site object into schedule_bin 2017-10-24 10:15:35 -04:00
Calen Pennington
2dc4621db0 Move log_prefix up to be a class attribute 2017-10-24 10:15:34 -04:00
Calen Pennington
199468eca9 DRY up the Schedule*.run task methods 2017-10-24 10:15:34 -04:00