Deena Wang
25aca5866d
Merge branch 'master' into feature/deena/testing
...
Conflicts:
lms/djangoapps/courseware/tests/test_access.py
2013-02-01 10:19:40 -05:00
Deena Wang
7908d87902
more tests for views.py
2013-01-31 15:58:14 -05:00
Deena Wang
abc3e5b09d
more tests in test_views.py
2013-01-31 14:47:59 -05:00
Chris Dodge
ab9d30cbc6
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs
2013-01-31 10:51:24 -05:00
Chris Dodge
fc57e7afdb
add testing for course info export. Plus DRY things out a bit
2013-01-31 10:51:20 -05:00
Calen Pennington
76b367e062
Merge pull request #1388 from MITx/bug/dhm/mar13
...
Swallow event calls to squash 404 errors (and remove an unused var in
2013-01-30 14:10:02 -08:00
Don Mitchell
756a071634
misspelled request (altho as an unused identifier)
2013-01-30 17:08:21 -05:00
Calen Pennington
c4f56620df
Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"
...
This reverts commit ab437b94637a8e87c789
2013-01-30 16:49:49 -05:00
Deena Wang
40ddaa9976
more tests on test_views.py
2013-01-30 16:03:16 -05:00
Don Mitchell
85faab1dc6
Swallow event calls to squash 404 errors (and remove an unused var in
...
another function)
2013-01-30 15:18:51 -05:00
Calen Pennington
ab437b9463
Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic
...
Don't run collectstatic on course content
2013-01-30 12:07:47 -08:00
Christina Roberts
54c1fe9c67
Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs
...
adding exporting of tabs and custom_tags. Also added unit tests
2013-01-30 10:52:31 -08:00
Chris Dodge
c676046341
adding exporting of tabs and custom_tags. Also added unit tests
2013-01-30 13:25:17 -05:00
Deena Wang
cdbe9857d6
tests in cms.djangoapps.contentstore/tests/test_views.py
2013-01-30 12:30:48 -05:00
Chris Dodge
7f32aae47d
rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability
2013-01-30 11:50:11 -05:00
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
