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

2445 Commits

Author SHA1 Message Date
Don Mitchell
dc9654283e Fix unit tests for generated 
course ids.
 2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
John Eskew
fcf57a8e0d Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops 
Wrap studio views in bulk operations to minimize mongo calls.
 2014-09-24 20:41:33 -04:00
John Eskew
46cd9b0ad9 Add bulk_operations wrapper around all course-query-intensive Studio views. 2014-09-24 19:23:00 -04:00
Carlos Andrés Rocha
fc04d8f262 Use strings instead of tuples as keys in SessionKeyValueStore 
Some Django packages expect only strings as keys in the user session,
and it is also a recommended practice in the Django manual.
 2014-09-24 15:17:46 -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
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
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
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
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
f336d0490c Html escaped from display name in xblock. 
LMS-11194
 2014-09-15 13:33:48 +05:00
Waheed Ahmed
a1e911ae39 Fixed InvalidKeyError in course handler in studio. 
LMS-11141
 2014-09-12 15:16:36 +05:00
Nimisha Asthagiri
2930e29a01 LMS-11373 Fix Studio drag and drop race condition. 2014-09-11 10:53:05 -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
3a772752de LMS-11286 Paver Bokchoy support for Split; default store set to Split. 2014-09-11 10:48:09 -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
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
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
Sarina Canelake
b58b6882a6 Merge pull request #5115 from mitocw/cg/bugfix/add_git_clean 
Fixes git export to support repositories with dots in their name and cleans export repo
 2014-09-09 09:15:33 -04:00
Sarina Canelake
3a73fccc8e Merge pull request #5101 from mitocw/cg/bugfix/remove_translated_log_messages 
Remove some uneeded translation strings in git_export
 2014-09-09 09:06:45 -04:00
zubair-arbi
fc7d491cdc show upload progress on import course view + display last import status on import page load 
STUD-2017
 2014-09-08 17:51:51 +05:00
Carson Gee
0891d9ad6e Added git clean to git export feature 
This ensures that additional exports of the content are the
same the first.
 2014-09-05 16:29:48 -04:00
Carson Gee
9abd35343e Fixes git export to support repositories with dots in their name 2014-09-05 15:54:58 -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
Carson Gee
42c721e88c Remove some uneeded translation strings in git_export 2014-09-05 11:43:30 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling 
Course Rerun: include stack trace in errors and Log errors.
 2014-09-04 16:25:43 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 
Enable bulk operations on split
 2014-09-03 11:18:23 -04:00
Nimisha Asthagiri
bd54cd8c57 LMS-11332 Unit test 2014-09-03 09:15:01 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info 
Split/edit info
 2014-09-03 08:28:31 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on 
to make consistent with other edit info timestamps
LMS-11184
 2014-09-02 13:20:23 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Andy Armstrong
c14891e920 Pre-cache has_changes when computing ancestors 2014-08-29 14:09:42 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Calen Pennington
3afc125ecb Add test to verify bad query behavior of xblock_handler 2014-08-29 14:09:41 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
muhammad-ammar
2efee4eb88 Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3 
Bok-Choy Video Transcript Tests Batch3
 2014-08-28 19:44:24 +05:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Calen Pennington
a205788c4d Work around for split not having a coherent way to work with/track updated versions of structures 2014-08-27 16:29:48 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Calen Pennington
337b0b48aa Improve check_number_of_calls family of methods 2014-08-27 16:29:47 -04:00