42213 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Albert St. Aubin	de6d48a698	Added Program Purchase button to the Programs dashboard ... Learners can upgrade or enroll as verified in all remaining courses in a program from their programs dashboard [LEARNER-1899]	2017-08-09 16:52:51 -04:00
sarahkf	679bd2c6a6	Merge pull request #15743 from edx/sarahkf/proctor-review-rules ... Adding link to proctor review rules in Studio	2017-08-09 15:06:57 -04:00
Harry Rein	a04af07d71	Merge pull request #15774 from edx/HarryRein/LEARNER-2027-resume-course-eventing ... Eventing on Resume Course click on home page	2017-08-09 15:05:59 -04:00
Harry Rein	8415d766ee	Merge pull request #15676 from edx/HarryRein/LEARNER-1857-new-profile-styling ... LEARNER-1857: New profile styling	2017-08-09 15:04:58 -04:00
Harry Rein	8f6aa79c1a	Adds eventing to Resume/Start course on Home Page. ... LEARNER-2027 Adding eventing on resume and start course button clicks as well as a single jasmine test to assure Logging is occuring as expected.	2017-08-09 14:17:12 -04:00
Harry Rein	e8bae62f04	UX improvements on learner profile. ... LEARNER-1857 This story constitutes a large change to the UX of the learner profile. Some specific changes include adding a flexible learner profile card, limiting the bio entry to only 300 characters and assuring that the page is responsive.	2017-08-09 13:57:42 -04:00
Jesse Shapiro	f0c685307c	Merge pull request #15739 from open-craft/haikuginger/configure-sap-sf-sso-user-fields ... [ENT-538] Configure country field for SAP SuccessFactors IdP	2017-08-09 13:57:01 -04:00
Jesse Shapiro	700e8053db	Generalize support for user fields from SAP SuccessFactors SSO providers	2017-08-09 13:07:00 -04:00
Sarah Fischmann	2511c9fad6	Adding link to proctor review rules in Studio ... Allows instructors to see a link to the online proctoring review rules documentation while configuring and exam to be a proctored exam. Also updates the GitHub requirements to point to the newest 0.19.0 release of edx-proctoring. EDUCATOR-757	2017-08-09 12:48:02 -04:00
Feanil Patel	1be6698d3c	Merge pull request #15783 from edx/revert-15768-bradmerlin/problem-builder-version-bump ... Revert "Update problem-builder xblock install version (PLAT-1644)"	2017-08-09 12:26:30 -04:00
Braden MacDonald	b58579526c	Revert "Update problem-builder xblock install version (PLAT-1644)"	2017-08-09 09:05:05 -07:00
Brian Mesick	7f32e03dd2	Merge pull request #15766 from edx/bmedx/ratelimit_upgrade_PLAT-1633 ... Upgrade django-ratelimit-backend to Django 1.11	2017-08-09 10:59:24 -04:00
Brian Mesick	1d47211245	Merge pull request #15768 from open-craft/bradmerlin/problem-builder-version-bump ... Update problem-builder xblock install version (PLAT-1644)	2017-08-09 10:58:32 -04:00
Alex Dusenbery	e17e9979d1	EDUCATOR-1117 | Call celery task with kwargs in the correct fashion.	2017-08-09 10:54:46 -04:00
Waheed Ahmed	4f25d1aa2c	Merge pull request #15779 from edx/waheed/LEARNER-2039-send-welcome-email-on-registration ... Send welcome email to inactive learners on registration.	2017-08-09 19:22:50 +05:00
Waheed Ahmed	f780b02b03	Send welcome email to inactive learners on registration. ... LEARNER-2039	2017-08-09 16:39:14 +05:00
Zubair Afzal	ed4a831f57	Merge pull request #15778 from edx/zub/ENT-557-enterprise-version-bump-to-0.39.9 ... bump enterprise version from 0.39.8 to 0.39.9	2017-08-09 14:34:22 +05:00
zubair-arbi	e5925c3f2a	bump enterprise version from 0.39.8 to 0.39.9 ... ENT-557	2017-08-09 12:47:13 +05:00
Aamish Baloch	941605cc7e	Merge pull request #15728 from edx/aamishbaloch/YONK-725 ... YONK-725: PARENTAL_CONSENT_AGE_LIMIT set to be configurable	2017-08-09 11:57:52 +05:00
edx-pipeline-bot	09c76a7b0f	Merge pull request #15773 from edx/private_to_public_d28b140 ... Mergeback PR from private to public.	2017-08-08 17:19:12 -04:00
Christina Roberts	98dd14f21d	Merge pull request #15770 from edx/christina/slash-the-slash ... Remove usages of deprecated SlashSeparatedCourseKey.	2017-08-08 16:36:49 -04:00
Ahsan Ulhaq	0ad7084df8	fix python test	2017-08-08 16:27:48 -04:00
Ahsan Ulhaq	cc65dff728	Host poisoning vulnerability fix ... LEARNER-2172	2017-08-08 16:27:48 -04:00
John Eskew	27557a0d92	Merge pull request #15746 from edx/jeskew/celery_modules_to_django1.11_compat ... Upgrade celery modules to Django 1.11-compatible versions.	2017-08-08 14:07:41 -04:00
Alex Dusenbery	272da1e528	EDUCATOR-1043 | ZeroSubsectionGrade's graded/all_total should have a non-zero possible score where appropriate.	2017-08-08 12:40:26 -04:00
cahrens	fd62164563	Remove usages of deprecated SlashSeparatedCourseKey.	2017-08-08 12:32:58 -04:00
Tasawer Nawaz	9b9995e8bf	Merge pull request #15769 from edx/revert-15731-waheed/LEARNER-2039-send-welcome-email-on-new-user-creation ... Revert "Send welcome email to inactive learners on registration."	2017-08-08 21:04:52 +05:00
bmedx	973d26f4b6	Make autodiscover the same across CMS/LMS	2017-08-08 11:21:51 -04:00
bmedx	45d6f97e63	Clean up autodiscover	2017-08-08 10:28:27 -04:00
Waheed Ahmed	853c9cd8df	Revert "Send welcome email to inactive learners on registration."	2017-08-08 19:00:09 +05:00
Diana Huang	b839253168	Merge pull request #15713 from edx/diana/in-place-enrollment ... Allow in-course enrollment	2017-08-08 09:47:10 -04:00
Ahsan Ul Haq	3a1e376099	Merge pull request #15717 from edx/ahsan/LEARNER-2105-accessibility-issues-lms-dashboard-social-links ... Accessibility issues on LMS Dashboard Social links	2017-08-08 17:34:30 +05:00
Ahsan Ulhaq	e298004287	Accessibility issues on LMS Dashboard Social links ... LEARNER-2105	2017-08-08 15:24:27 +05:00
Waheed Ahmed	cd8d31b732	Merge pull request #15761 from edx/waheed/LEARNER-1209-fix-login-page-password-restriction ... Fix login page password min length restriction.	2017-08-08 13:04:41 +05:00
John Eskew	1630d052a0	Upgrade celery modules to Django 1.11-compatible versions.	2017-08-07 16:56:06 -04:00
Diana Huang	8d3fa5432a	Add in-place enrollment to course home page.	2017-08-07 16:33:20 -04:00
Christina Roberts	4f5b033c27	Merge pull request #15750 from edx/christina/slash-the-slash ... Remove SlashSeparatedCourseKey from tests	2017-08-07 15:53:08 -04:00
bmedx	d91a634d4b	Set up correct admin urls in CMS	2017-08-07 15:34:50 -04:00
bmedx	48e6e552f2	PLAT-1633: Upgrade django-ratelimit-backend to 1.1.1	2017-08-07 15:34:21 -04:00
cahrens	6f71706b17	Remove SlashSeparatedCourseKey from tests.	2017-08-07 14:49:30 -04:00
edx-pipeline-bot	b411fa0c79	Merge pull request #15765 from edx/release-mergeback-to-master ... Merge release back to master	2017-08-07 13:51:57 -04:00
Brittney Exline	7bc87a5f56	Merge pull request #15754 from edx/douglashall/upgrade_enterprise_0_39_8 ... Upgrading edx-enterprise to 0.39.8.	2017-08-07 10:17:46 -04:00
Eric Fischer	7c06fad512	Merge pull request #15757 from edx/efischer/saturday ... EDU-1090, take 2 part 3	2017-08-07 09:46:42 -04:00
Nimisha Asthagiri	74829243d6	Merge pull request #15758 from edx/neem/course-overview-force-update ... Add force_update option to generate_course_overview command	2017-08-07 08:40:20 -04:00
Waheed Ahmed	e29c3fde35	Fix login page password min length restriction. ... In the reset password flow one can enter a single character password and subsequently cannot login to the site as password complexity is apparently enforced on the login page. Login page should not enforce password complexity. LEARNER-1209	2017-08-07 17:11:45 +05:00
Waheed Ahmed	6e780eaaf3	Merge pull request #15731 from edx/waheed/LEARNER-2039-send-welcome-email-on-new-user-creation ... Send welcome email to inactive learners on registration.	2017-08-07 14:04:20 +05:00
Brad Melin	eb31db26b6	update problem-builder xblock install version	2017-08-07 10:38:58 +02:00
Waheed Ahmed	f073a11475	Send welcome email to inactive learners on registration. ... LEARNER-2039	2017-08-07 12:44:50 +05:00
Clinton Blackburn	986afbfa38	Powering courseware deadline with schedules	2017-08-05 22:06:17 -04:00
Clinton Blackburn	85e4274a05	Refactored tests for date summary blocks	2017-08-05 22:06:17 -04:00