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

43013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
f520f9bd4e Merge pull request #16202 from edx/waheed/LEARNER-2769-course-dates-web-fragment 
Course dates web fragment for mobile apps.
 2017-10-17 14:29:08 +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
Andy Armstrong
80126fc79f Merge pull request #16232 from edx/andya/bootstrap-support-modal 
Make the support modal responsive
 2017-10-16 14:39:51 -04:00
Andy Armstrong
fb820f9b25 Merge pull request #16211 from edx/andya/further-stylelint-fixes 
More Sass quality fixes
 2017-10-16 14:39:21 -04:00
edx-pipeline-bot
c011e7134d Merge pull request #16243 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-16 14:14:37 -04:00
Andy Armstrong
af4d419824 Make the support modal responsive 
LEARNER-142
 2017-10-16 13:33:50 -04:00
Andy Armstrong
bd1a0d96cf More Sass quality fixes 2017-10-16 12:41:20 -04:00
Gabe Mulley
4a13f9bf53 ACE writes to a file by default 2017-10-16 12:17:25 -04:00
John Eskew
df47204441 Merge pull request #16241 from edx/jeskew/add_django_simple_history_back_to_rc_reqs 
Add django-simple-history back to edx-platform as a requirement.
 2017-10-16 09:45:30 -04:00
John Eskew
1f36bf0876 Add django-simple-history back to edx-platform as a requirement. 
The module is still used by (at least) edx-enterprise.
 2017-10-16 09:42:22 -04:00
Douglas Hall
6387e3a813 Merge pull request #16225 from edx/asadiqbal08/ENT-694 
Enterprise- Version bumped to 0.51.5
 2017-10-16 09:17:43 -04:00
Waheed Ahmed
158abee9cb Merge pull request #16228 from edx/waheed/LEARNER-2828-fix-frontend-email-regex-on-login 
Fix frontend email regex for login page.
 2017-10-16 16:17:00 +05:00
Waheed Ahmed
a1da105d07 Fix frontend email regex for login page. 
Currently we are using Django 1.4 regex for email validation which
does not allow custom domains (e.g. eclo.solutions), fixed it with
latest Django 1.11 regex.

LEARNER-2828
 2017-10-16 12:48:13 +05:00
Aamish Baloch
02ab4a0364 Merge pull request #16146 from edx/aamishbaloch/YONK-776 
YONK-776: added thread_followed and thread_unfollowed signals
 2017-10-16 11:54:49 +05:00
John Eskew
4a1e8af7cf Merge pull request #16236 from edx/jeskew/add_missing_tox_req_files 
Add edx-private and sandbox req files to tox env.
 2017-10-14 10:54:06 -04: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
John Eskew
8bd17fc6a9 Add edx-private and sandbox req files to tox env. 2017-10-13 17:19:21 -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
edx-pipeline-bot
a7888b7829 Merge pull request #16231 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-13 15:28:19 -04:00
Alex Dusenbery
b89e6419a5 Prevent compute_all_grades_for_course() task from being executed more than once every hour. 2017-10-13 15:13:53 -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
Michael LoTurco
12e09d1c2e Merge pull request #16185 from edx/MLoTurco/learner-1996 
Adding spanish certificate template partials learner-1996
 2017-10-13 13:42:09 -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
3f7d8bc9b4 Merge pull request #16187 from edx/tuchfarber/program_marketing 
Rewrite program marketing page to use Bootstrap and change design to look more like other marketing design
 2017-10-13 13:12:51 -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
Douglas Hall
d5e9e66593 Merge pull request #16230 from edx/douglashall/hotfix_10_13_2017 
Fix get_enterprise_customer api cache key.
 2017-10-13 11:56:31 -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
Andy Armstrong
87b43ba05c Merge pull request #16200 from edx/andya/bootstrap-rtl-support 
Add RTL support for Bootstrap CSS
 2017-10-13 11:11:32 -04:00
Michael LoTurco
96dbd26f83 Added edx-themed certificate template partials for learner-1996 2017-10-13 11:02:20 -04:00
Douglas Hall
5033aad3a1 Fix get_enterprise_customer api cache key. 
ENT-704
 2017-10-13 11:00:33 -04:00
Nimisha Asthagiri
741917e92b Course Update emails 2017-10-13 10:53:44 -04:00
Dennis Jen
3c4323010c Merge pull request #16221 from edx/dsjen/fix-config-text 
Fixed typos in comment and config  message.
 2017-10-13 10:26:55 -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
956cb91955 Add an import of a submodule to make pytest less complainy 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
George Song
2605bf99b6 Merge pull request #15700 from mitodl/aq_unicode_issue_capa 
Fixed problem with non-Latin characters in loncapa/python problems
 2017-10-13 04:59:21 -07:00
Douglas Hall
457b9a110a Merge pull request #16223 from edx/douglashall/ENT-704 
Fix get_enterprise_customer api cache key.
 2017-10-13 06:59:19 -04:00
Douglas Hall
2062dd8629 Fix get_enterprise_customer api cache key. 
ENT-704
 2017-10-13 14:43:12 +05:00
asadiqbal
c5be291e6f Version bumped 2017-10-13 11:31:07 +05:00
Andy Armstrong
fc3af68e3b Add RTL support for Bootstrap CSS 
LEARNER-1705
 2017-10-13 00:15:01 -04:00
Dennis Jen
badcd439ff Fixed typos in comment and config message. 2017-10-12 16:48:55 -04:00
Nimisha Asthagiri
c5e0ce503e Merge pull request #16218 from edx/naa/fix-grade-zero-error 
Grades: Fix ZeroDivisionError
 2017-10-12 15:36:07 -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
Nimisha Asthagiri
811ab640f9 Grades: fix ZeroDivisionError 2017-10-12 14:17:56 -04:00
McKenzie Welter
5557eae276 Merge pull request #16212 from edx/McKenzieW/cert-lookup-logic-fix 
extended parameters of non-language-specific custom certificate templates
 2017-10-12 13:06:43 -04:00