41298 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douglas Hall	02bbccd40d	Merge pull request #15220 from edx/douglashall/fix_activation_email_support_link ... Fix the activation email support link in the dashboard sidebar	2017-06-01 07:41:47 -04:00
Clinton Blackburn	6ff614800c	Updated auto_auth endpoint to always return JSON ... Defaulting to a plaintext response makes no sense for an endpoint that is intended to be used by machines for testing. The endpoint now returns JSON only unless a redirect action is triggered.	2017-05-31 23:18:05 -04:00
Douglas Hall	0bf74f849e	Fix the activation email support link in the dashboard sidebar	2017-05-31 20:18:02 -04:00
Braden MacDonald	c285b4f36d	Merge pull request #15160 from open-craft/uman/OC-2665 ... [ENT-381] Conform to WCAG 2 AA contrast minimums for Google OAuth.	2017-05-31 15:33:24 -07:00
AlasdairSwan	14692ae214	Merge pull request #15217 from edx/alasdair/LEARNER-923-support-tab-css-update-for-pl-pages ... LEARNER-923 Make Pattern Library support tabs transparent	2017-05-31 16:22:40 -04:00
Christina Roberts	d2653b4b17	Merge pull request #15148 from edx/christina/ed-427-again ... Christina/ed 427 again	2017-05-31 15:31:36 -04:00
AlasdairSwan	c89714400f	LEARNER-923 Make Pattern Library support tabs transparent	2017-05-31 15:25:46 -04:00
Alex Dusenbery	1a0e42af5e	EDUCATOR-435 | Include enrollment status in in course and problem grade reports.	2017-05-31 15:13:51 -04:00
cahrens	106ac3a136	Change visibility to access. ... EDUCATOR-396	2017-05-31 14:10:56 -04:00
Gregory Martin	aac143e62a	Merge pull request #15128 from edx/neem/handle_gp_changed ... Django Signal Handler for GRADING_POLICY_CHANGED	2017-05-31 13:38:47 -04:00
Gregory Martin	77b2229210	GradingPolicyChanged Signal Handler ... https://openedx.atlassian.net/browse/EDUCATOR-393	2017-05-31 10:46:55 -04:00
Andy Armstrong	e8a36957b1	Merge pull request #15205 from edx/andya/clean-imports-cms ... Reorder Studio imports using isort	2017-05-30 20:36:56 -04:00
Andy Armstrong	f4b0a76c0b	Merge pull request #15204 from edx/andya/clean-imports-2 ... Reorder imports using isort (except lms and cms)	2017-05-30 20:36:41 -04:00
Clinton Blackburn	e9cdc133a6	Updated programs detail page to always call Credentials API ... The programs detail page now always makes a call to the Credentials API to check for program credentials, regardless of whether the user has earned a course certificate. The course certificate constraint adds an additional burden to testing in exchange for slightly decreased load on the API. The cost outweighs the benefit given the limited traffic to this page. LEARNER-1103	2017-05-30 17:30:20 -04:00
Adam	7ab3bb2105	Merge pull request #14869 from edx/adam/add-index-to-nodes ... add indices to item nodes when dumping to neo4j	2017-05-30 17:19:50 -04:00
Andy Armstrong	ebb04ca396	Reorder Studio imports using isort	2017-05-30 17:00:50 -04:00
Adam Palay	4331132920	add indices to item nodes when dumping to neo4j	2017-05-30 16:33:15 -04:00
Andy Armstrong	93235d118d	Reorder imports using isort (except lms and cms)	2017-05-30 16:04:54 -04:00
John Eskew	fc57527c5a	Merge pull request #15208 from edx/jeskew/revert_PR_15170 ... Revert pull request #15170 - merging this PR with no reviews, as it's a revert of a previous PR. Reviewers - take note...	2017-05-30 15:16:25 -04:00
John Eskew	3b57542ab0	Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" ... This reverts commit f97f052591, reversing changes made to 800bcd8e20.	2017-05-30 12:42:54 -04:00
Douglas Hall	d71a1d8887	Merge pull request #15038 from replaceafill/replaceafill/ENT-343 ... [ENT-343] Add Terms of Service modal	2017-05-30 10:38:50 -04:00
M. Rehan	b61a28dd75	Merge pull request #15197 from edx/mrehan/transcripts-upload-when-only-vid-id ... Override video url with edx val encodings	2017-05-30 14:54:16 +05:00
Attiya Ishaque	bbf10c11d1	Merge pull request #15189 from edx/ai/EDUCATOR-3-resolve-NoneType-object ... EDUCATOR-3 Check for course before using it.	2017-05-30 13:44:42 +05:00
Qubad786	4c074f11cf	Override video url with edx val encodings	2017-05-30 12:58:39 +05:00
Uman Shahzad	84e428129a	Conform to WCAG 2 AA contrast minimums for Google OAuth. ... Also apply variables for FB/Linkedin OAuth2 rather than leave color hashes hanging around.	2017-05-29 22:58:53 -04:00
Douglas Cerna	eaa02db6ae	Added Terms of Service modal	2017-05-29 11:57:04 -06:00
attiyaishaque	7f3e4cb810	EDUCATOR-3 Check for course before using it.	2017-05-29 17:43:44 +05:00
Clinton Blackburn	74f9858b77	Optimized all imports in common.test.acceptance ... - Removed unused imports - Ran isort to properly order/style imports	2017-05-28 00:59:22 -04:00
Douglas Hall	6894dafa61	Merge pull request #15161 from open-craft/uman/OC-2663 ... ENT-392 Refactoring	2017-05-26 15:18:43 -04:00
Uman Shahzad	a41195377c	Allow configurable activation email support link. ... This also serves as a slight refactor of ENT-392.	2017-05-26 14:25:15 -04:00
Matt Drayer	ea195ff28a	Merge pull request #15118 from edx/mattdrayer/hide-audit-enterprise ... ENT-405: Hide the audit option from track selection for certain enterprise scenarios	2017-05-26 09:20:01 -04:00
John Eskew	31912ac1a9	Merge pull request #15176 from edx/jeskew/move_license_mixin ... Move LicenseMixin and accompanying code to openedx/core/lib.	2017-05-25 17:30:39 -04:00
John Eskew	e30e44cb9a	Run isort on files touched in LicenseMixin move.	2017-05-25 16:24:57 -04:00
John Eskew	f1369b912e	Move LicenseMixin and accompanying code to openedx/core/lib.	2017-05-25 16:17:31 -04:00
Andy Armstrong	643d9eda7d	Merge pull request #15191 from edx/andya/use-isort ... Add isort to edx-platform	2017-05-25 14:51:52 -04:00
John Eskew	f97f052591	Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance ... Move fields.py, inheritance.py, and partitions to openedx/core.	2017-05-25 14:21:03 -04:00
Clinton Blackburn	800bcd8e20	Updated CredentialsApiConfig to pull URLs from settings ... Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy. LEARNER-1103	2017-05-25 13:30:43 -04:00
John Eskew	76389d8678	Run all files touched in inheritance/partition work through isort.	2017-05-25 13:24:08 -04:00
John Eskew	66f3aa5ccf	Move fields.py, inheritance.py, and partitions to openedx/core.	2017-05-25 13:24:08 -04:00
Andy Armstrong	f81c21902e	Add isort to edx-platform ... LEARNER-1168	2017-05-25 11:39:43 -04:00
Cliff Dyer	8a4bb2e670	Merge pull request #15184 from edx/neem/cms-dash-inefficiencies ... Cleanup inefficiencies in Studio dashboard	2017-05-25 11:12:21 -04:00
Anthony Mangano	8bb56fa448	Merge pull request #15133 from edx/LEARNER-842-show-language-selector-in-lms-footer ... Learner 842 Add ability to show language selector in LMS footer	2017-05-25 10:42:01 -04:00
J. Cliff Dyer	6c6f271e0e	Comment out broken speed test.	2017-05-25 10:18:43 -04:00
Douglas Hall	fa981e84f4	Merge pull request #15186 from edx/douglashall/WL-1052 ... Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting.	2017-05-24 21:32:38 -04:00
Douglas Hall	8f95f799ac	Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting. ... WL-1052	2017-05-24 20:24:14 -04:00
Anthony Mangano	0172ff315a	add ability to show footer language selector on LMS	2017-05-24 16:41:45 -04:00
J. Cliff Dyer	61d247d4bb	Prefer iters and sets to lists	2017-05-24 15:49:45 -04:00
Renzo Lucioni	6129494a4c	Retry getting program details if they initially fail to be retrieved ... get_many sometimes fails to bring back details cached on one or more Memcached nodes. It doesn't look like these keys are being evicted. 99% of the time all keys come back, but 1% of the time all the keys stored on one or more nodes are missing from the result of the get_many. One get_many may fail to bring these keys back, but a get_many occurring immediately afterwards will succeed in bringing back all the keys. This behavior can be mitigated by trying again for the missing keys, which is what we do here. Splitting the get_many into smaller chunks may also help. LEARNER-382	2017-05-24 10:00:05 -04:00
Adam	f0f09ce6c9	Merge pull request #15171 from edx/adam/fix-unicode-error ... make translated string unicode (EDUCATOR-460)	2017-05-24 07:26:55 -04:00
Adam Palay	3b803085db	make translated string unicode (EDUCATOR-460)	2017-05-23 13:13:56 -04:00