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

5371 Commits

Author SHA1 Message Date
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
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04: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
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
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
Don Mitchell
ad57cbe932 Get rid of obsolete field checking 2014-09-15 09:22:49 -04:00
Don Mitchell
f04e75db90 Get rid of unused fragment 2014-09-15 09:01:34 -04:00
Don Mitchell
b137f8d7ad Explain query counts 
Fix trivial excesses (2 splits configured & don't fetch courses if there are none)
LMS-11220, LMS-11391, LMS-11390
 2014-09-15 08:50:10 -04:00
Waheed Ahmed
e18e18a855 Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change 
Fixed video not playing after changing speed to anything other than 1.
 2014-09-15 15:06:56 +05:00
Waheed Ahmed
0448c9942d Fixed video not playing after changing speed to anything other than 1. 
BLD-1221
 2014-09-15 14:30:37 +05:00
Waheed Ahmed
f336d0490c Html escaped from display name in xblock. 
LMS-11194
 2014-09-15 13:33:48 +05:00
lduarte1991
a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions 
- changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
 2014-09-13 13:42:06 -04:00
Ben Patterson
ef383891f2 TE-468 JS test: Use the correct array for validating onSeek logs 
This particular test is failing in Solano workers; there the log
is written in a different order, which was causing objects not to
be found.
 2014-09-11 12:22:16 -05:00
Nimisha Asthagiri
dedd88ccf4 Merge pull request #4977 from edx/split/paver 
Split/paver LMS-11211
 2014-09-11 12:28:41 -04:00
Calen Pennington
b9908ec2f1 Only format test assertion messages when they are needed (they are a performance hit when testing large courses) 2014-09-11 11:52:10 -04:00
Calen Pennington
c0616aeb2c Remove unneccesary uses of SON (which is slower than dict) 2014-09-11 11:52:09 -04:00
Calen Pennington
a72cbfe68a Add an index on _id.revision to allow separating draft and published during export 2014-09-11 11:52:09 -04:00
Calen Pennington
ce88f61670 Create indexes before running cross-modulestore import/export tests 2014-09-11 11:52:06 -04:00
Don Mitchell
935d5dee34 LMS-11331, LMS-11345 Make auth check branch agnostic; fix deserialize keys 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -04:00
Calen Pennington
7b81dcc3ea Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364] 2014-09-11 09:38:13 -04:00
Calen Pennington
df6dc21939 Make split_draft correctly autopublish both parent and child during create_child 2014-09-11 09:37:13 -04:00
Calen Pennington
bc40b8f149 Fix auto-publish test to work with old-mongo 2014-09-11 09:37:12 -04:00
Calen Pennington
3fd4e395f4 Verify using mixed that auto-publish actually updates child pointers 2014-09-11 09:37:12 -04:00
Calen Pennington
6cd7e08c1b Assert course equality in bulk, so that all differences are displayed 2014-09-11 09:37:12 -04:00
Tim Babych
f1da4efb8e Merge pull request #5152 from edx/tim/less-has-changes 
Calculate has_changes only Section/Subsection only on Outline page
 2014-09-11 16:11:42 +03:00
zubair-arbi
27c29d0dfd Merge pull request #5140 from edx/zub/bugfix/plat-101-playercontrolsnotvisible 
show video controls for all youtube videos
 2014-09-11 17:35:49 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos 
TNL-184
 2014-09-11 17:02:27 +05:00
Tim Babych
8b37dd7f95 Calculate has_changes only Section/Subsection only on Outline page 2014-09-11 12:42:56 +03:00
Don Mitchell
8f90e39626 Merge pull request #5149 from edx/mongo/bulk_operation 
Generalize bulk_operations logic
 2014-09-10 16:16:40 -04:00
Don Mitchell
4faed64859 Generalize bulk_operations logic 
LMS-11366
 2014-09-10 15:35:28 -04:00
Adam
a346fcca2c Merge pull request #5144 from edx/adam/fix-copy 
fixes help copy for annotation settings
 2014-09-09 13:34:07 -04:00
Adam Palay
12b49ef2d4 fixes help copy for annotation settings 2014-09-09 11:43:32 -04:00
Don Mitchell
0f8355fd47 Test inheritance to new xblocks in same request 2014-09-08 16:13:30 -04:00
Don Mitchell
74c44c5e2b Cache inherited settings outside of structure 
LMS-11363
 2014-09-08 15:55:45 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Nimisha Asthagiri
3f8ea64d33 Merge pull request #5083 from edx/split/revert-to-published 
LMS-11357 Split revert_to_publish: correctly revert to Published version
 2014-09-05 14:38:45 -04:00
Nimisha Asthagiri
69ce5ac849 Merge pull request #5110 from edx/split/pylint-fixes 
Pylint issues in test_mixed_modulestore.py.
 2014-09-05 14:33:36 -04:00
Nimisha Asthagiri
0bd9bc628c Update mongo count. 2014-09-05 14:13:00 -04:00
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -04:00
Nimisha Asthagiri
2fa445c413 LMS-11357 Split revert_to_publish: correctly revert to Published version 2014-09-05 13:54:24 -04:00
Nimisha Asthagiri
c0ee194042 Pylint issues in test_mixed_modulestore.py. 2014-09-05 13:46:38 -04:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Nimisha Asthagiri
db0f9dfc83 LMS-11354 Make Split has_changes check subtree. 2014-09-05 12:20:32 -04:00