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

14251 Commits

Author SHA1 Message Date
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
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
wajeeha-khalid
b5edd01812 MA-3052: avoid catalog integration for individual course when cached 2016-12-21 10:41:29 -05:00
AsadAzam
fc79fae565 Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key 
TNL-5487 – Fix InvalidKeyError on render xblock
 2016-12-21 17:56:09 +05:00
Gregory Martin
909f35bbb6 add blankTitle option 2016-12-20 18:43:57 -05:00
Gregory Martin
8c0098812d Merge pull request #14078 from edx/yro_remove-datetimetext-functions 
remove datetext utils
 2016-12-20 16:17:47 -05:00
Adam Palay
c4c5a8e8a9 Revert "tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation." 
This reverts commit 3ad2f09233.
 2016-12-20 13:34:28 -05:00
Gregory Martin
b0bf19a741 delete datetext functions, implement dateutils 2016-12-20 11:10:06 -05:00
asadazam93
01f3233a50 Fix InvalidKeyError on render xblock 2016-12-20 13:03:50 +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
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
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
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
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
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
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05: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
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
Brian Jacobel
e07a7d96b9 fixup! Fix TNL-6139 2016-12-14 12:54:45 -05:00
Ari Rizzitano
1e686f4763 [video] fix AC-343 
[captions] move role attr from li element to nested span (AC-343)

[video] fix failing tests for video captions (AC-343)

[video] couple more failing tests (AC-343)

[video] properly outline the focused caption (AC-343)
 2016-12-14 11:39:53 -05:00
Brian Jacobel
b42150c78e fixup! Fix TNL-6142 2016-12-14 10:51:43 -05:00
Saleem Latif
a860d0c858 Merge pull request #14114 from edx/saleem-latif/ENT-78 
ENT-78: Update saml --pull command to raise error when it fails.
 2016-12-14 18:23:42 +05:00
noraiz-anwar
5207e2fc91 Remove access for inactive users 2016-12-14 14:26:11 +05:00
Andy Armstrong
f58d920b13 Hide the navigation bar when sorting won't work 2016-12-13 17:23:19 -05:00
Andy Armstrong
52d5de5b5d More discussion styles 2016-12-13 12:17:23 -05:00
Brian Jacobel
13eee1c104 Fix TNL-6142 2016-12-13 11:31:32 -05:00
Brian Jacobel
1958a3636e Fix TNL-6139 2016-12-13 11:31:32 -05:00
Andy Armstrong
4922d7753e Clean up discussion styles to be consistent across views 2016-12-13 08:39:51 -05:00
Saleem Latif
befe3052c9 Update saml --pull command to raise error when it fails. 2016-12-13 12:36:38 +05:00
Andy Armstrong
81c4e17033 Revert to showing all posts upon adding a post 2016-12-12 17:30:21 -05:00
Andy Armstrong
7287e8ef85 Fix a number of styling bugs 2016-12-12 17:07:06 -05:00
Ben Patterson
a15be622bb Merge pull request #14133 from edx/benp/fix-flaky-video-trans 
Flaky video translations test fix.
 2016-12-12 16:01:33 -05:00
Ben Patterson
4c48e6a307 Cleanup, remove flaky decorator. 2016-12-12 11:40:25 -05:00
Jesse Shapiro
da6303ad4d Merge pull request #14053 from open-craft/haikuginger/final-consent-hooks 
[ENT-61] Changes to accommodate consent logic on Enterprise app
 2016-12-12 11:05:59 -05:00
Mark Sadecki
3468ca345e Merge pull request #14121 from edx/cptvitamin/AC-680 
removes redundant alt attribute value
 2016-12-12 11:04:01 -05:00
Brian Jacobel
54a9db776d Remove thread 'inline' rendering mode, make tab mode the One True Mode 2016-12-12 11:01:58 -05:00
alisan617
f5936b36ae remove Related to in inline, add it to Profile, spacing nits 2016-12-12 11:01:57 -05:00
alisan617
ee3a58edea revert Error message back as it is for the modal title 2016-12-12 11:01:57 -05:00
alisan617
03d93a2e89 copy edits and profile page title 2016-12-12 11:01:57 -05:00
Brian Jacobel
2f78b0ec3c Fix alignment when posting is disabled in teams 2016-12-12 11:01:56 -05:00
Brian Jacobel
787dac9046 use DiscussionThreadListView for user profile discussion 2016-12-12 11:01:56 -05:00