Commit Graph

1709 Commits

Author SHA1 Message Date
Chris Dodge
e5115953ad rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course 2013-01-30 11:36:28 -05:00
Chris Dodge
74fcf96611 don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it 2013-01-30 09:43:57 -05:00
Calen Pennington
9ae83338c6 Whitespace cleanup 2013-01-30 09:12:50 -05:00
Calen Pennington
89f984c08b Prefix courseware urls with /static, since they are no longer served through collectstatic 2013-01-30 09:12:50 -05:00
Deena Wang
3858362157 more tests 2013-01-29 15:53:20 -05:00
Deena Wang
4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files 2013-01-29 14:33:54 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Deena Wang
85c412fc2e changed cms/env/tests, added test_views.py 2013-01-29 11:06:32 -05:00
Deena Wang
74839663ff added cms/djangoapps/contentstore/test/tests.py 2013-01-29 10:12:39 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Chris Dodge
9c3e727889 add unit test to assert that the flag is not set on course metadata 2013-01-23 15:14:36 -05:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
cahrens
65d45d6dee Minor cleanup. 2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Chris Dodge
1cb2a6724d add some additional logging for optional verbosity 2013-01-14 22:31:21 -05:00
Calen Pennington
f91a5f0e23 Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes
Fix/cdodge/filesystem xml fixes
2013-01-14 09:34:25 -08:00
Chris Dodge
b5776a775e add another assert test 2013-01-14 12:17:51 -05:00
Chris Dodge
edb913f6ac add tests for about content overrides 2013-01-14 12:12:40 -05:00
chrisndodge
fdba0e48dc Merge pull request #1270 from MITx/bug/dhm/jan13
Fixed bug 114: randomized problems never right b/c state not preserved
2013-01-14 06:21:47 -08:00
Don Mitchell
208ed0a438 Fixed bug 114: randomized problems never right b/c state not preserved
on server
2013-01-11 16:48:19 -05:00
Chris Dodge
9479ef3c84 fix up call signatures for get_parent_locations() 2013-01-11 14:29:53 -05:00
Brian Talbot
e7e26a471c studio - changed expectation of lettuce test for course overview section toggling 2013-01-11 12:03:17 -05:00
chrisndodge
5368a9ad3e Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
Decrease the number of queries needed for LMS courseware
2013-01-11 07:23:00 -08:00
Jay Zoldak
64e8f9c0cd Add BDD lettuce tests for studio overview toggle section feature. 2013-01-10 16:00:40 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
chrisndodge
ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor
Feature/cas/speed editor
2013-01-09 17:52:46 -08:00
Don Mitchell
fff9afdeb8 Minor cleanups 2013-01-09 11:38:01 -05:00
Don Mitchell
b8f530e865 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 10:49:20 -05:00
Don Mitchell
2d8ddb0dcb Ever slightly more rigorous test. actually look for the markdown field
in the model as well as the ancillary info
2013-01-09 10:47:03 -05:00
Don Mitchell
62a70170cf Updated unit test for the create operation related to bug 107 2013-01-09 09:55:50 -05:00
Don Mitchell
2019c9d037 Bug 107 2013-01-09 09:47:43 -05:00
cahrens
d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor 2013-01-09 09:41:35 -05:00
Don Mitchell
21f5c2d89a Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing
Set up the framework for running lettuce tests against studio
2013-01-09 06:30:03 -08:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
Don Mitchell
ae4e7815a9 CapaDescriptor new unit tests 2013-01-08 13:16:38 -05:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
2013-01-07 10:55:10 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Calen Pennington
7f39dd974b Minor whitespace cleanup 2013-01-02 15:07:56 -05:00
Calen Pennington
4bec871b0f Don't return BadRequest classes, return instances 2013-01-02 15:07:12 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -05:00