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

14268 Commits

Author SHA1 Message Date
noraiz-anwar
9c139a87a6 Error while exporting course with too long filename 2017-01-05 14:43:48 +05:00
Ben Patterson
74302e3b08 Merge pull request #14238 from edx/benp/bok-choy-shard-11 
Run bok-choy tests across 11 shards
 2017-01-03 13:55:39 -05:00
Gregory Martin
b816982b8e Merge pull request #14224 from edx/yro_fix-PR14078 
Fix PR 14078; fix course home regression
 2017-01-03 12:39:47 -05:00
Ben Patterson
bf28861eec Create shards 10 and 11 for bok-choy. 2017-01-03 12:00:40 -05:00
Christina Roberts
4a71af8d6e Merge pull request #14160 from edx/christina/help-menu-tests 
Add tests for context-sensitive Help button.
 2017-01-03 10:39:43 -05:00
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -05:00
Calen Pennington
30bf20687b Merge pull request #14242 from edx/release 
Release 2016-12-22
 2017-01-03 10:11:04 -05:00
Nimisha Asthagiri
1de87f9112 Merge pull request #14213 from edx/beryl/mongocrazy 
Pre-load Definitions in Split Modulestore when accessing all blocks
 2017-01-03 09:37:40 -05:00
Nimisha Asthagiri
99e6d53939 Preload definitions when collecting block structures 2016-12-29 08:51:26 -05:00
Gregory Martin
1ec9371f31 set wait for jquery decorator 2016-12-27 14:37:52 -05:00
Anthony Mangano
57f0999b3a improve screen reader support on logistration pages 
ECOM-6107
 2016-12-27 09:33:29 -05:00
Robert Raposa
18e3e095d1 Merge pull request #14174 from edx/robrap/credo-hide-bookmarks-feature-in-lti-mode-3 
OSPR-1527: robrap/credo hide bookmarks feature in lti mode
 2016-12-22 11:39:25 -05:00
Dmitry Viskov
fc0577d081 Hide bookmarks link in the LTI mode 2016-12-22 09:56:33 -05:00
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
Brian Jacobel
c3930956ca Remove flaky decorator from test, it's not flaky. 2016-12-21 19:09:43 -05:00
Brian Jacobel
a56b30495d Merge pull request #14192 from edx/bjacobel/a11y-discussions-test-broken 
Flaky inline discussions test marked with @flaky
 2016-12-21 19:04:51 -05:00
Brian Jacobel
86975faa5f Skip this test until it can be fixed, in TNL-6215 2016-12-21 16:54:41 -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
cahrens
c9fb71c4a1 Add tests for context-sensitive Help button. 2016-12-15 16:42:06 -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