Saleem Latif
|
80d85c4abf
|
edx-enterprise version update for 'Added alphabetical ordering for catalog drop down '
|
2016-12-22 14:42:57 +05:00 |
|
Mushtaq Ali
|
07c93a8ed5
|
Merge pull request #14140 from edx/mushtaq/video-upload-restrict
Video upload restrictions
|
2016-12-22 14:35:17 +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 |
|
Cliff Dyer
|
b3051ced35
|
Merge pull request #14195 from edx/cdyer/save-cl-data
Save content library selected blocks during transform phase.
|
2016-12-21 16:58:10 -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
|
4ead911f05
|
Merge pull request #14199 from cpennington/revert-wajeeha
Fix quality issues
|
2016-12-21 16:23:31 -05:00 |
|
Calen Pennington
|
bd87061f1c
|
Merge pull request #14196 from edx/release
Merge Release back into master
|
2016-12-21 16:17:40 -05:00 |
|
Calen Pennington
|
147639ab85
|
Merge pull request #14197 from cpennington/fix-release-merge-conflict
Fix release merge conflict
|
2016-12-21 16:16:52 -05:00 |
|
Nimisha Asthagiri
|
b90c21b138
|
Ensure selected blocks get saved into StudentModule when running
transform phase
TNL-6198
|
2016-12-21 15:58:41 -05:00 |
|
Gregory Martin
|
59daa1c022
|
Merge pull request #14189 from edx/yro_student-acct-timezone-fix
change variable name
|
2016-12-21 15:03:09 -05:00 |
|
Calen Pennington
|
a24ac5155b
|
Merge remote-tracking branch 'edx/master' into release
|
2016-12-21 15:01:46 -05:00 |
|
Calen Pennington
|
b34d110b15
|
Merge pull request #14193 from edx/release-candidate
Release candidate
|
2016-12-21 14:57:35 -05:00 |
|
Calen Pennington
|
3e0c8fb7ba
|
Fix quality issues
|
2016-12-21 14:20:36 -05:00 |
|
Calen Pennington
|
e6190c9911
|
Merge pull request #14190 from cpennington/revert-wajeeha
Revert Marketing URL changes
|
2016-12-21 13:24:51 -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
|
7f942bfc49
|
Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr"
This reverts commit dec4034bc5, reversing
changes made to ef55cc4f5f.
|
2016-12-21 13:19:59 -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 |
|
sanfordstudent
|
e860205e67
|
Merge pull request #14191 from edx/beryl/content_library_access
Test retrieving subsection grade after losing access to block in subsection
|
2016-12-21 13:19:05 -05:00 |
|
Nimisha Asthagiri
|
d1d8d31bba
|
Test retrieving subsection grade after losing access to block in subsection
|
2016-12-21 11:49:33 -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 |
|
Gregory Martin
|
ce76e2c3f8
|
change variable name
|
2016-12-21 10:24:55 -05:00 |
|
sanfordstudent
|
74a666643c
|
Merge pull request #14151 from edx/sstudent/TNL-6178
context manager for course id in context
|
2016-12-21 09:26:28 -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 |
|
Mushtaq Ali
|
2c7941d1ef
|
Prevent files larger than 5 GB
Prevent file containig containing non-ascii or special characters in file name
TNL-5855 TNL-5957
|
2016-12-21 16:36:17 +05:00 |
|
Gregory Martin
|
ff8c4a6eec
|
Merge pull request #14178 from edx/yro_set-default-timezone-settings
add blankTitle option
|
2016-12-20 20:58:35 -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 |
|
alisan617
|
5b6e2dd5ee
|
Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187
new inline discussion style fixes
|
2016-12-20 15:57:47 -05:00 |
|
Adam
|
30c84118e9
|
Merge pull request #14179 from edx/adam/fix-stringresponse-issue
Revert "tnl-4141 only whitespaces not allowed in answer and fixed the…
|
2016-12-20 15:37:05 -05:00 |
|
Sanford Student
|
ac9b8fba5e
|
context manager for course id in context
|
2016-12-20 15:26:05 -05:00 |
|
alisan617
|
e28f42b11f
|
discussion img upload dialog RTL and other clean-up
|
2016-12-20 14:54:24 -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 |
|
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 |
|
Gregory Martin
|
b0bf19a741
|
delete datetext functions, implement dateutils
|
2016-12-20 11:10:06 -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 |
|
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 |
|
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 |
|