40095 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nimisha Asthagiri	9436edf856	Merge pull request #14446 from edx/beryl/grades-mongo-query ... Fix mongo query count for Grades API	2017-02-02 11:13:06 -05:00
Attiya Ishaque	f7aed5cb26	Merge pull request #14428 from edx/TNL-6419-change-in-code ... TNL-6419 Fix in file-checking code in Xmodule.	2017-02-02 17:55:45 +05:00
attiyaishaque	0869df22c4	TNL-6419 Fix in file-checking code in Xmodule.	2017-02-02 17:02:59 +05:00
Marko Jevtić	43ffe63f57	Merge pull request #14429 from edx/mjevtic/WL-963 ... [WL-963] Mark test as flaky	2017-02-02 11:47:39 +01:00
Hasnain Naveed	f9365a2460	Merge pull request #14440 from edx/hasnain-naveed/instructor-info-in-courseoverview/WL-912 ... WL-912 | Added instructor info in course overview model.	2017-02-02 15:16:06 +05:00
Marko Jevtic	a83ac7d8b3	[WL-963] Mark test as flaky	2017-02-02 09:12:46 +00:00
Jillian Vogel	0e90ee5fbf	Merge pull request #14015 from open-craft/haikuginger/add-swift-settings-to-cms ... Add swift settings to CMS	2017-02-02 10:28:49 +10:30
Nimisha Asthagiri	7cc08399c6	Fix mongo query count for Grades API	2017-02-01 17:58:36 -05:00
Jesse Shapiro	9d5db5ae24	Adds OpenStack settings to CMS environment ... and a comment and explaining why we import aws.* in the openstack settings.	2017-02-02 09:27:22 +10:30
Nimisha Asthagiri	1912176c5a	Merge pull request #14438 from edx/beryl/cohort_integrity_error ... Fix cohort IntegrityErrors	2017-02-01 15:35:21 -05:00
Andy Armstrong	1c6cfb0b04	Merge pull request #14441 from fghaas/color-default ... FEDX-300 Set !default on Sass colors	2017-02-01 15:03:17 -05:00
Jesse Zoldak	d1012a771d	Merge pull request #14425 from edx/revert-14200-jmbowman/async_course_import ... Revert "PLAT-1104 Import courses asynchronously"	2017-02-01 11:32:39 -05:00
Jesse Zoldak	94b78ecbf5	Merge pull request #14442 from edx/revert-14439-beryl/grades-mongo-query ... Revert "Fix mongo query count for Grades API"	2017-02-01 11:12:48 -05:00
Jesse Zoldak	b0647e7d83	Revert "Fix mongo query count for Grades API"	2017-02-01 11:09:43 -05:00
Nimisha Asthagiri	0f89af8af1	Merge pull request #14439 from edx/beryl/grades-mongo-query ... Fix mongo query count for Grades API	2017-02-01 10:27:43 -05:00
Brian Jacobel	e8a60f7da8	Merge pull request #14437 from edx/bjacobel/wmd-disabled-undo-redo ... Add aria-disabled to WMD undo/redo buttons	2017-02-01 10:11:00 -05:00
Clinton Blackburn	62241b2b66	Merge pull request #14408 from edx/clintonb/automated-refunds ... Automating Refund Approvals	2017-02-01 09:33:06 -05:00
Nimisha Asthagiri	704a16ad3f	Fix mongo query count for Grades API	2017-02-01 09:32:27 -05:00
Stu Young	c0a64c2b1e	Merge pull request #14436 from edx/estute/pin-astroid-for-pylint-dependency ... pin astroid version 1.3.8 for pylint dep	2017-02-01 08:49:02 -05:00
Florian Haas	64fd392933	v1 Sass (CMS): set !default on all colors ... Colors should be overridable. See https://openedx.atlassian.net/browse/PLAT-1181 This sets all color variables to !default for v1 (pre-Pattern Library) Sass in Studio.	2017-02-01 11:52:37 +01:00
Florian Haas	b7f996afcb	v1 Sass (LMS): remove duplicate color definition ... The double definition of $blue-d1, $blue-d2, and $blue-d4 is superfluous, so remove the second instance of each.	2017-02-01 11:52:33 +01:00
Florian Haas	85a8e22117	v2 Sass (LMS): Set !default on all colors ... Colors should be overridable. See https://openedx.atlassian.net/browse/PLAT-1181 This sets all color variables to !default for v2 (Pattern Library) Sass.	2017-02-01 11:52:33 +01:00
Florian Haas	688c3f395d	v1 Sass (LMS): set !default on all colors ... Colors should be overridable. See https://openedx.atlassian.net/browse/PLAT-1181 This sets all color variables to !default for v1 (pre-Pattern Library) Sass.	2017-02-01 11:52:28 +01:00
Hasnain	180cf299a3	Added instructor info in course overview.	2017-02-01 15:19:52 +05:00
Zia Fazal	4a41b6f0f9	Merge pull request #14427 from edx/ziafazal/TNL-6400 ... updated lti_consumer xblock to latest version	2017-02-01 14:33:57 +05:00
Clinton Blackburn	7c39978b06	Automated refund approval process ... Refunds are now processed automatically. If the automated processing fails, the system falls back to the previous behavior of notifying the Support Team. Additionally, these calls are all made by the service user rather than the learner. ECOM-6541	2017-02-01 01:51:21 -05:00
Clinton Blackburn	1189867dd2	Removed references to ECOMMERCE_API_SIGNING_KEY ... We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in. ECOM-6541	2017-02-01 01:51:21 -05:00
stu	43329adeaf	comment astroid dependency	2017-01-31 22:59:54 -05:00
Nimisha Asthagiri	95b4cbbcf8	Fix cohort Integrity Errors ... TNL-5725	2017-01-31 22:56:56 -05:00
Clinton Blackburn	e5112bd3a3	Merge pull request #14433 from edx/clintonb/docker-devstack-test ... Simplified Docker Devstack test settings	2017-01-31 17:55:29 -05:00
Brian Jacobel	ecc9afa19c	Add aria-disabled to WMD undo/redo buttons	2017-01-31 17:11:28 -05:00
Clinton Blackburn	6b2ca06544	Simplified Docker Devstack test settings ... The only value that needs to be overridden is the Mongo host. The duplicated values can be imported.	2017-01-31 16:59:24 -05:00
Renzo Lucioni	8a53f3b6c7	Merge pull request #14430 from edx/renzo/backpopulation-from-catalog ... Use the catalog for program certificate backpopulation	2017-01-31 15:23:20 -05:00
stu	4b60f1339e	pin astroid version 1.3.8 for pylint dep	2017-01-31 15:10:45 -05:00
Christina Roberts	255af25a32	Merge pull request #14432 from edx/christina/quality ... Fix safe template warning.	2017-01-31 14:35:16 -05:00
Renzo Lucioni	4027dd8444	Use the catalog for program certificate backpopulation ... This command is used to backfill missing program certificates. Formerly, it used the programs service. It now uses the catalog service exclusively. ECOM-4422	2017-01-31 14:20:49 -05:00
cahrens	0f3eb6e94c	Fix safe template warning.	2017-01-31 13:43:36 -05:00
Toby Lawrence	823a43166f	Merge pull request #14416 from edx/feature/consistent-hashing ... Include django-memcached-hashring to support consistent hashing.	2017-01-31 12:41:33 -05:00
Christina Roberts	feb1c82d4d	Merge pull request #14415 from edx/christina/tnl-6357 ... Show checkmarks when "Show Answer" is clicked.	2017-01-31 10:57:18 -05:00
cahrens	55712d1148	Show checkmarks when "Show Answer" is clicked. ... TNL-6357	2017-01-31 09:55:08 -05:00
Marko Jevtić	327ffa92a0	Merge pull request #14051 from edx/vkaracic/SOL-2133 ... [SOL-2133] Add user deactivation endpoint.	2017-01-31 14:46:48 +01:00
Vedran Karacic	7fe8e47554	[SOL-2133] Add user deactivation endpoint.	2017-01-31 11:34:26 +00:00
Saleem Latif	c2d7e4469a	Merge pull request #14340 from edx/saleem-latif/ENT-112 ... ENT-112: Update settings for edx-enterprise (v0.19.1) configurations.	2017-01-31 15:33:15 +05:00
Saleem Latif	ab88da952b	Update settings for edx-enterprise (v0.19.1) configurations.	2017-01-31 14:19:51 +05:00
Jesse Zoldak	83a451dc0b	Revert "PLAT-1104 Import courses asynchronously"	2017-01-30 19:21:43 -05:00
Jeremy Bowman	576f6755f8	Merge pull request #14200 from edx/jmbowman/async_course_import ... PLAT-1104 Import courses asynchronously	2017-01-30 16:50:55 -05:00
Eric Fischer	3546c26198	Merge pull request #14410 from edx/efischer/tnl-6408 ... Allow null course_edited_timestamp	2017-01-30 14:12:36 -05:00
Eric Fischer	6f8383199f	Allow null edited_timestamp ... Some old mongo courses do not have this field, and the team has opted to allow null values rather than inserting a default. This change affects both course and subsection grades. TNL-6408	2017-01-30 13:19:36 -05:00
Eric Fischer	a78db97d26	Delay grades recalculation task ... As discovered in load testing, if this task is run too quickly it can ask for a newly-recorded score prior to the active transaction finishing and writing to the database. TNL-6424	2017-01-30 13:19:36 -05:00
Jeremy Bowman	831cd4b85b	PLAT-1104 Import courses asynchronously	2017-01-30 12:19:33 -05:00