Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,865 Commits 1 Branch 0 Tags
3efb5c0249535cf8bf508568746777c5eece500d
Commit Graph

9374 Commits

Author SHA1 Message Date
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers 
keep large answers from appearing (TNL-441)
 2014-09-23 14:01:03 -04:00
David Baumgold
9f6454411e Update tests for changed text 2014-09-23 12:02:31 -04:00
David Baumgold
c0a25da964 Skip invalid test when in CMS 2014-09-23 12:02:31 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
Jason Bau
83c54d4e6e Merge pull request #5048 from Stanford-Online/jbau/edx/custom-response-fractional-grades 
capa custom response support for decimal grades
 2014-09-23 06:49:13 -07:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
Jason Bau
637f55414f capa custom response support for decimal grades 2014-09-22 13:27:46 -07:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release 
Release merge - post hotfix-2014-09-19-1
 2014-09-19 14:31:16 -04:00
Adam Palay
f57e30959e keep large answers from appearing (TNL-441) 2014-09-19 11:41:01 -04:00
Adam Palay
0a385544a3 update number of queries in embargo test 2014-09-19 10:19:23 -04:00
Adam Palay
ac862b7a97 only load tabs if user is enrolled in course (TNL-286) 
add tests for static tabs
 2014-09-19 10:19:23 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
 2014-09-18 17:59:12 -04:00
Ben Patterson
9f573f3413 Merge pull request #5282 from edx/benp/js-test-timeouts 
Disable flaky javascript tests TE-485
 2014-09-18 14:45:26 -04:00
Ben Patterson
c875f71573 Disable flaky javascript tests TL-439 2014-09-18 14:43:57 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Waheed Ahmed
ef0af6e9d5 Fixed full screen functionality for image module in HTMLModule. 
TNL-265
 2014-09-18 19:00:44 +05:00
Andy Armstrong
6bf5207494 Merge pull request #5266 from edx/andya/remove-pr-5152 
Revert the changes from PR 5152
 2014-09-17 14:04:22 -04:00
lduarte1991
bb4cfaba03 Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging 
- changed message and added i18n
 2014-09-17 13:00:37 -04:00
Andy Armstrong
7c4d8d3752 Revert the changes from PR 5152 
The changes in 5152 appear to have introduced a
 performance problem on stage, so we're going to
 revert them for now.
 2014-09-17 12:24:59 -04:00
Sarina Canelake
dd04813aab Merge pull request #5096 from marcore/bypass-activation-email-extauth 
Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True
 2014-09-17 12:03:49 -04:00
Chris Dodge
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -04:00
zubair-arbi
eefd9f23a5 Merge pull request #5243 from edx/zub/bugfix/tnl-392-videocontrolstestfailure 
wait for notification on adding video component
 2014-09-17 19:40:48 +05:00
clytwynec
3f5b829d0e Merge pull request #5147 from edx/clytwynec/auto_capture_har_on_error 
enable auto-capturing of hars in bok-choy tests
 2014-09-17 09:15:20 -04:00
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04:00
Ned Batchelder
1a7009ec1f Merge pull request #5251 from edx/ned/revert-lti-username-email 
Revert "username and email request for lti module"
 2014-09-17 06:59:42 -04:00
Tim Babych
d9df388855 Merge pull request #5221 from edx/tim/sourcemaps-debug-only 
Do not generate CSS source maps in production
 2014-09-17 13:37:55 +03:00
marcore
686aa3af82 Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True 2014-09-17 11:30:27 +02:00
Ned Batchelder
4edeeb72c2 Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-16 16:13:41 -04:00
jmclaus
43ce6421cf Merge pull request #5059 from edx/anton/add-video-context-menu 
BLD-1230: Video Link Obfuscation
 2014-09-16 19:18:16 +02:00
Jim Abramson
32a45e1978 Merge pull request #5227 from edx/jsa/tnl153 
allow TAs to select the cohort of new posts.
 2014-09-16 12:46:13 -04:00
jsa
eef28a4f25 allow TAs to select the cohort of new posts. 
TNL-153
 2014-09-16 12:44:41 -04:00
polesye
2997a80aa5 Video link obfuscation. [BLD-1230] 2014-09-16 18:13:07 +02:00
Jesse Zoldak
f31768b690 Merge pull request #5207 from edx/waheed/tnl284-fix-flaky-test 
Fixed bok choy flaky test for studio.
 2014-09-16 11:41:13 -04:00
Tim Babych
12f280b62a [TNL-198] Do not generate JS and CSS source maps in production 2014-09-16 15:39:09 +03:00
zubair-arbi
b2b46332f8 wait for notification on adding video component 
TNL-392
 2014-09-16 17:20:31 +05:00
Ben Patterson
b7b4760074 Merge pull request #5175 from edx/benp/solano2-jstest-failure 
TE-468 JS test: Use the correct array for validating onSeek logs
 2014-09-16 08:09:41 -04:00
Waheed Ahmed
8efa9daec1 Fixed bok choy flaky test for studio. 
TNL-284
 2014-09-16 16:04:08 +05:00
Don Mitchell
032ff1cd61 Merge pull request #5200 from edx/split/lms-11396 
Updating active_versions should not send old and new
 2014-09-15 16:44:10 -04:00
Don Mitchell
043c08bf5b Updating active_versions should not send old and new 
but just use old to get query info.
LMS-11396
 2014-09-15 16:02:53 -04:00
Don Mitchell
7090ef6588 Ensure deleting a direct only removes it from published 
as well as draft
LMS-11395
 2014-09-15 16:00:02 -04:00
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries 
Explain query counts
 2014-09-15 15:57:11 -04:00
Christine Lytwynec
4b5b72a39d add promise to get around race condition in discussion bok-choy test 2014-09-15 15:28:54 -04:00
Don Mitchell
6568463513 Merge pull request #5223 from edx/bug/lms-11361 
Bug/lms 11361
 2014-09-15 15:25:26 -04:00
Sarina Canelake
95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 
Annotation Tools: Give staff/instructors full permissions (bug fix)
 2014-09-15 14:25:19 -04:00
Don Mitchell
bf0c4f5185 Don't let destructive loc change 
leak out to callers.
Also, use the return from update_item rather than assume
it was just side effecting.
LMS-11361
 2014-09-15 13:47:07 -04:00
Christine Lytwynec
1be81109e5 enable auto-capturing of hars in bok-choy tests 2014-09-15 12:14:47 -04:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
Don Mitchell
4c3b4a59b4 Merge pull request #5208 from edx/split/misc_fixups 
Split/misc fixups
 2014-09-15 11:18:25 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00