17329 Commits

Author	SHA1	Message	Date
Brian Mesick	3951b7527c	Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 ... Tag LMS Unit 3 tests that fail in Django 1.11	2017-11-30 16:14:18 -05:00
Matt Tuchfarber	c25e4ba045	Merge pull request #16648 from edx/tuchfarber/add_price_to_marketing_button ... Add pricing data to program purchase button	2017-11-30 13:11:06 -05:00
Nimisha Asthagiri	7a6805b261	Merge pull request #16714 from edx/pacing/spanish-language-issue ... Schedules: course language -> closest released language	2017-11-30 10:47:53 -05:00
Nimisha Asthagiri	38cfadeb20	Schedules: convert course language to supported released language	2017-11-29 20:08:33 -05:00
Uman Shahzad	8a361300ec	Fix some mako-missing-default xsslint issues in test files.	2017-11-29 23:50:31 +05:00
Brian Mesick	167b28302c	Merge pull request #16704 from edx/revert-15511-proversity/add-recover-password-endpoint ... Revert "Add recover password endpoint"	2017-11-29 11:49:15 -05:00
Sofiya Semenova	2fca453fcd	Merge pull request #16656 from edx/sofiya/notifications-followup ... Follow-up to email template for forum notifications after testing in stage	2017-11-29 11:01:13 -05:00
Douglas Hall	88195d4772	Merge pull request #16457 from edx/uman/degreed ... [ENT-676] Degreed Integration	2017-11-29 10:59:43 -05:00
Diana Huang	8693f2fd38	UX updates to registration form. ... - hide optional fields by default. - instructions only shown when focused in. - removed header - Terms of service link and checkbox on same line.	2017-11-29 09:46:54 -05:00
Brian Beggs	845e64cd78	Revert "Add recover password endpoint"	2017-11-29 09:44:10 -05:00
Uman Shahzad	59a8db9bbc	Add the Degreed app and version bump for Degreed.	2017-11-29 18:13:19 +05:00
Tasawer Nawaz	8a78daa8c8	update design of support form + form will be shown only to logged in users ... LEARNER-3288	2017-11-29 10:20:01 +05:00
J. Cliff Dyer	f76a099e2d	Skip completion of non-default scorable blocks. ... If a scorable block either has a custom completion strategy, or is marked as excluded from completion, don't record a completion when its score is updated.	2017-11-28 18:04:28 -05:00
Sofiya Semenova	1ef5cf9f7a	Preformatted styling for post content	2017-11-28 15:19:17 -05:00
J. Cliff Dyer	b8202e40de	Handle default complete-by-viewing completion method. ... * Vertical marks blocks completed when viewed. * Functionality is hidden behind a waffle switch * Submissions from front-end are limited to known-incomplete blocks * Upgrades xblock to version 1.1.1 * Related future requirements listed in TODO tagged with EDUCATOR-1778 and relevant opencraft OC-* ticket IDs. OC-3088	2017-11-28 15:07:06 -05:00
Calen Pennington	64dd633fc9	Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2 ... WIP: Decaffeinate Test Files (Part 2)	2017-11-28 13:34:26 -05:00
Sven Marnach	b77bff4d96	Small fixes to support Okta SSO.	2017-11-28 16:50:53 +01:00
Jose Antonio Gonzlez	0decade2a8	Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]	2017-11-27 16:55:51 -06:00
Sofiya Semenova	ea488f84ed	Merge pull request #16633 from edx/sofiya/ed-1560 ... Educator 1560 - Clean up labelling in the Discussion Add Post form	2017-11-27 13:47:54 -05:00
Michael Terry	ffc838250d	Merge pull request #16605 from mikix/mikix/border-a11y ... Show current tab even in high contrast mode	2017-11-27 12:14:29 -05:00
Jose Antonio Gonzalez	93464298e4	Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]	2017-11-27 10:28:32 -06:00
sanfordstudent	b6d9dfb2ab	Merge pull request #16652 from edx/add-persistent-grade-override-table-in-admin ... Add `PersistentSubsectionGradeOverride` table in django admin	2017-11-27 11:12:34 -05:00
Sofiya Semenova	3244fc0d67	Educator 1560 - Clean up labelling in the Discussion Add Post form	2017-11-27 11:12:05 -05:00
Jeremy Bowman	139fa895d1	Merge pull request #16662 from edx/jmbowman/more_ssencrypt_tests ... Add more ssencrypt tests	2017-11-27 10:29:41 -05:00
Awais Jibran	baa967ca66	Add PersistentSubsectionGradeOverride table in django admin ... EDUCATOR-1624	2017-11-27 10:11:57 -05:00
Brian Mesick	9911c8d068	Merge pull request #16649 from edx/bmedx/django111_tag_test_failures_lms_1 ... Tag LMS Unit 1 tests that fail in Django 1.11	2017-11-27 09:15:53 -05:00
Brian Mesick	3d5fef7882	Merge pull request #16655 from edx/bmedx/django111_tag_test_failures_lms_2 ... Tag LMS Unit 2 tests that fail in Django 1.11	2017-11-27 09:15:26 -05:00
Jose Antonio Gonzalez	7a1dd74a0f	dont redefine post method [ci skip]	2017-11-24 15:54:42 +02:00
raeeschachar	5196f4b108	Fix header logo link to MKTG root. ... In courseware, banner Logo links to Dashboard, footer logo links to home page. LEARNER-2881	2017-11-24 18:26:26 +05:00
Jose Antonio Gonzalez	5150a96005	fix pep8	2017-11-24 14:59:41 +02:00
Jose Antonio Gonzalez	0171e79764	fix pylint [ci skip]	2017-11-24 14:07:28 +02:00
Jose Antonio Gonzalez	2e45a9b136	Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]	2017-11-24 13:13:44 +02:00
Ayub khan	4aeb7f1058	Merge pull request #16667 from edx/Update_pull_translations_Nov_23 ... Updated pull Translations	2017-11-23 17:09:37 +05:00
ayub-khan	9e619e4244	Updated Translations	2017-11-23 16:02:47 +05:00
Ahsan Ulhaq	da675e52dc	Learner certificates should not be findable before the available date ... LEARNER-3298	2017-11-23 14:14:05 +05:00
Matjaz Gregoric	d403e5f8b1	Introduce LMS_INTERNAL_ROOT_URL. ... The LMS and edx-enterprise currently communicate via REST APIs, even though they are all running within the same service. Currently API URLs are constructed using LMS_ROOT_URL, but that is problematic on some systems where the external LMS_ROOT_URL is not accessible from the private network, or routing internal requests via the external URL is not desireable. This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which defaults to the value of LMS_ROOT_URL for backwards compatibility. The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct API URLs instead of LMS_ROOT_URL.	2017-11-23 08:17:38 +01:00
Jeremy Bowman	b00b6b89a8	Add more ssencrypt tests	2017-11-22 17:59:02 -05:00
bmedx	ace88e7d5a	Tag LMS Unit 3 tests that fail in Django 1.11 ... Fixed some url reverse errors instead of marking since they were trivial	2017-11-22 15:48:00 -05:00
bmedx	d827d47b48	Tag LMS Unit 2 tests that fail in Django 1.11	2017-11-22 15:47:22 -05:00
bmedx	5fbbf4979a	Tag LMS Unit 1 tests that fail in Django 1.11	2017-11-22 15:46:45 -05:00
David Ormsbee	94614db46e	CoffeeScript tests migration: Remove implicit returns	2017-11-22 15:39:50 -05:00
David Ormsbee	0880502f26	CoffeeScript tests migration: Decaffeinate files ... This is running decaffeinate, with no additional cleanup.	2017-11-22 15:39:50 -05:00
David Ormsbee	5c64da2f63	CoffeeScript tests migration: Rename files ... Step 1 in our migration steps is to rename the CoffeeScript files to the JS files they will be replaced with, so that we can preserve file history.	2017-11-22 15:39:50 -05:00
edx-pipeline-bot	c23b0fce1a	Merge pull request #16659 from edx/release-mergeback-to-master ... Merge release back to master	2017-11-22 15:26:40 -05:00
Jeremy Bowman	4ba29b4707	Convert unicode to bytes for RSA encryption	2017-11-22 11:55:44 -05:00
Ned Batchelder	a2e2aace82	Merge pull request #16650 from edx/nedbat/fix-unused-imports ... Fix a number of unused-import pylint violations	2017-11-22 11:17:07 -05:00
John Eskew	872df1e4bd	Merge pull request #16647 from edx/jeskew/custom_template_loader_fixes ... Change template's deprecated '=' comparison to '=='.	2017-11-22 09:22:06 -05:00
Calen Pennington	7aa1a3460b	Merge pull request #16615 from edx/cale/schedules-admin-improvements ... Cale/schedules admin improvements	2017-11-21 22:06:37 -05:00
Ned Batchelder	e23e3a0486	Fix a number of unused-import pylint violations	2017-11-21 19:57:06 -05:00
Sofiya Semenova	885162c2d2	Follow-up to email template for forum notifications after testing in stage	2017-11-21 16:43:20 -05:00