Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,684 Commits 1 Branch 0 Tags
07865ce0874cd6c4e8daa8d80c288ce7e860d217
Commit Graph

39684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
07865ce087 Revert "Merge pull request #14187 from edx/jia/MA-3052" 
This reverts commit f7a0c1d901, reversing
changes made to dec4034bc5.
 2016-12-21 13:19:54 -05:00
Calen Pennington
f7a0c1d901 Merge pull request #14187 from edx/jia/MA-3052 
MA-3052: avoid catalog integration for individual course when cached
 2016-12-21 10:42:45 -05:00
wajeeha-khalid
b5edd01812 MA-3052: avoid catalog integration for individual course when cached 2016-12-21 10:41:29 -05:00
Nimisha Asthagiri
dec4034bc5 Merge pull request #14177 from edx/naa/fix-marketing-pr 
Fix Enrollment database access in Marketing Course URL PR
 2016-12-20 13:02:57 -05:00
Nimisha Asthagiri
f24830918c Fix Enrollment database access in Marketing Course URL PR 2016-12-20 12:03:03 -05:00
Albert (AJ) St. Aubin
ef55cc4f5f Merge pull request #14176 from edx/ora_1_1_13_release 
ORA2 1.1.13 release
 2016-12-20 10:33:31 -05:00
Albert St. Aubin
872341ed0c ORA2 1.1.13 release 2016-12-20 07:51:43 -05:00
Douglas Hall
934dcce148 Merge pull request #14170 from edx/douglashall/session_cookie_domain_override 
Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio
 2016-12-20 07:31:34 -05:00
Douglas Hall
65f0420500 Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio 2016-12-20 05:17:27 -05:00
Asad Iqbal
122aa55008 Merge pull request #14064 from edx/asadiqbal08/ENT-32-EC-branding 
ENT-32 Show enterprise customer branding on Logistration.
 2016-12-20 11:45:51 +05:00
asadiqbal
99f73dfbb3 ENT-32 Show enterprise customer branding on Logistration. 
nit: css
 2016-12-20 00:10:21 +05:00
Cliff Dyer
aa3d6e8791 Merge pull request #14092 from edx/cdyer/validate-capa-xml 
Use new XMLString field type for CAPA data field.
 2016-12-19 12:03:19 -05:00
Feanil Patel
12d8cc5021 Merge pull request #14171 from edx/feanil/add_more_docs 
Add more docs to the monitoring requirements file.
 2016-12-19 09:27:09 -05:00
Feanil Patel
b05282ac75 Add more docs to the monitoring requirements file. 2016-12-19 09:24:02 -05:00
sanfordstudent
6de2535ed3 Merge pull request #14158 from edx/release 
Release
 2016-12-16 11:25:01 -05:00
Andy Armstrong
d3d3819fd0 Merge pull request #14161 from edx/andya/fix-discussion-ux-bugs 
Clean up discussion styling issues
 2016-12-16 11:18:26 -05:00
Ari Rizzitano
467512abd7 Merge pull request #14159 from edx/high-contrast-sliders 
add hidden borders to video controls for high contrast mode
 2016-12-16 11:09:40 -05:00
Ari Rizzitano
1b06bdeec0 Merge pull request #14083 from edx/fix-unformatted-403 
fix unformatted html in studio error response
 2016-12-16 11:08:19 -05:00
Andy Armstrong
accbda34e2 Clean up discussion styling issues 
TNL-6184
 2016-12-16 10:04:57 -05:00
Ari Rizzitano
b5b8175932 [video] add hidden borders to controls to support windows high contrast mode (AC-458) 
[video] add hidden borders to video controls for high contrast mode (AC-458)

[video] minor border color adjustment (AC-458)

use variable names for colors

color variable names
 2016-12-16 09:54:07 -05:00
Ari Rizzitano
311e6d7ffd [studio] fix unformatted html in connection error message (TNL-5818) 
display default error message for non-json responses (TNL-5818)

[studio] log ajax errors. (TNL-5818)

[studio] fix failing test (TNL-5818)

[cms-test] avoid circular error logging; stub Logger (TNL-5818)

[cms-test] fix logger dep in squire config (TNL-5818)

[cms-tests] fix logger import (TNL-5818)

[cms-test] stub the logger directly in the karma config. (TNL-5818)

[studio] didn't need Logger after all (TNL-5818)

[studio] ignore console.log (TNL-5818)
 2016-12-16 09:51:39 -05:00
Marko Jevtić
7d791ab932 Merge pull request #13590 from edx/mjevtic/SOL-2082 
[SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage
 2016-12-16 15:06:58 +01:00
Marko Jevtic
363a0c8d90 [SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage 2016-12-16 12:42:17 +00:00
Afzal Wali Naushahi
024e2e4b33 Merge pull request #14045 from edx/afzaledx/WL-829_add_programs_to_courses_view_context 
Add programs list to the context for index.html and courses.html template.
 2016-12-16 16:43:47 +05:00
J. Cliff Dyer
22ce30039b Use new XMLString type for CAPA data field. 
TNL-5245
 2016-12-15 15:35:44 -05:00
sanfordstudent
2125a21f75 Merge pull request #14148 from edx/release-candidate 
Bump problem-builder to v2.6.5.
 2016-12-15 14:49:20 -05:00
Brian Jacobel
c1cf4e7870 Merge pull request #14155 from edx/bjacobel/inline-discussion-redesign 
Fix bug on new post creation
 2016-12-15 13:50:10 -05:00
Gregory Martin
fd9c26b11f Merge pull request #14152 from juananpe/honorbrowserlangs 
Honor browser defined language preferences when possible
 2016-12-15 12:07:52 -05:00
alisan617
15794b93cd Merge pull request #14138 from edx/alisan/new-post-discussion-TNL-6006 
Discussion new post form layout TNL-6006
 2016-12-15 11:02:00 -05:00
Ned Batchelder
486dae94a2 Merge pull request #14154 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-12-15 10:16:18 -05:00
Brian Jacobel
0e5f6c2e6f Fix bug on new post creation where we would try to hide an element that wasn't there 2016-12-15 10:04:48 -05:00
alisan617
41620e05f2 new discussion post form layout 2016-12-15 09:20:51 -05:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
Ned Batchelder
b56faaff34 Update translations (autogenerated message) 2016-12-15 12:40:38 +00:00
wajeeha-khalid
bde0f7b2a7 Merge pull request #13235 from edx/jia/MA-2684 
MA-2684: return correct marketing url for course about
 2016-12-15 17:37:52 +05:00
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05:00
Juanan Pereira
83d91fa7ff Honor browser defined language preferences when possible 2016-12-14 23:03:12 +01:00
Brian Jacobel
71693c3a12 Merge pull request #14026 from edx/bjacobel/inline-discussion-redesign 
Inline Discussion "two-level" redesign
 2016-12-14 16:33:00 -05:00
Jesse Zoldak
26413a575b Merge pull request #14149 from edx/revert-13441-honorbrowserdefinedlangs 
Revert "Honor browser defined language preferences when possible"
 2016-12-14 14:53:32 -05:00
Jesse Zoldak
5962328370 Revert "Honor browser defined language preferences when possible" 2016-12-14 14:52:57 -05:00
Gregory Martin
790a642ab1 Merge pull request #13441 from juananpe/honorbrowserdefinedlangs 
Honor browser defined language preferences when possible
 2016-12-14 14:16:23 -05:00
Ari Rizzitano
a42ebd9bd3 Merge pull request #14098 from edx/caption-link-role 
fix invalid role definition on interactive captions
 2016-12-14 14:02:57 -05:00
Juanan Pereira
67d0245e5a Honor browser defined langs 
Add tests for PR13441

Apply DRY principle, rename test function name
 2016-12-14 19:53:47 +01:00
Andy Armstrong
fd0cf4041e Clean up font weights 2016-12-14 13:52:55 -05:00
Andy Armstrong
570001d7ad Style fixes for previews and text areas 2016-12-14 13:43:52 -05:00
Brian Jacobel
4b6cf7ba47 Fixed issue with hover post actions causing title reflow 2016-12-14 13:35:31 -05:00
Brian Jacobel
483da0dab5 fixup! Fix TNL-6099 2016-12-14 13:18:52 -05:00
Brian Jacobel
601ff52fe6 fixup! Fix TNL-6133 2016-12-14 12:55:17 -05:00
Brian Jacobel
e07a7d96b9 fixup! Fix TNL-6139 2016-12-14 12:54:45 -05:00
Matjaz Gregoric
90707afa50 Bump problem-builder to v2.6.5. 
It includes support for course keys longer than 50 characters.

See: https://github.com/open-craft/problem-builder/pull/131
 2016-12-14 12:24:00 -05:00