Don Mitchell
62d389c853
Added empty metadata attribute instead of using name to determine which
...
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
Christina Roberts
0b91c1c346
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
...
clean up templates that were removed from disk - we need to remove from ...
2013-02-13 06:29:35 -08:00
Chris Dodge
fbe3d29f19
added tests
2013-02-13 09:25:09 -05:00
Carlos Andrés Rocha
dff0c10b7a
Merge pull request #1493 from MITx/bug/dhm/misc
...
Fix broken test and don't pass time units as strings but as ints.
2013-02-12 15:14:37 -08:00
Don Mitchell
c904174bb7
Fix broken test and don't pass time units as strings but as ints.
2013-02-12 17:30:57 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
Don Mitchell
46a7f7427a
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
...
add exporting of grading_policy.json
2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d
add exporting of grading_policy.json
2013-02-11 14:30:26 -05:00
Chris Dodge
4f67c6c052
quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button.
2013-02-10 16:17:08 -05:00
Don Mitchell
fa5537ab71
On first request for handouts, create the db record. (bug 160)
2013-02-07 17:09:57 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Jay Zoldak
72023cb5d2
Improve docstring wording for ModuleStoreTestCase class.
2013-02-06 10:42:21 -05:00
Jay Zoldak
abf4ad36f4
Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.
2013-02-06 10:42:21 -05:00
Jay Zoldak
fde6d1ba1c
Refactor tests for cms contentstore.
2013-02-06 10:42:21 -05:00
Jay Zoldak
3324615270
Reorganize test cases
2013-02-06 10:41:08 -05:00
Jay Zoldak
5a6b039208
Reorganize the CmsTestCase subclass
2013-02-06 10:36:28 -05:00
Jay Zoldak
2c5a7ccdf7
Rearrange factories and clean up imports
2013-02-06 10:36:28 -05:00
Jay Zoldak
b63c3c5a67
Change modulestore name and subclass TestCase
2013-02-06 10:36:28 -05:00
Christina Roberts
3222e083eb
Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
...
Fix bug where we imported two functions w/ the same name
2013-02-05 13:36:56 -08:00
Christina Roberts
0d8cfb9baa
Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
...
change from throwing a Http404 exception, which I believe will try to re...
2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
2013-02-05 16:26:07 -05:00
Calen Pennington
8360a7a7f5
Fix bug where we imported two functions w/ the same name
2013-02-05 16:23:10 -05:00
Calen Pennington
401f564e6a
Fix data directory passed to replace_static_urls
2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
...
This reverts commit c4f56620df
2013-02-05 11:06:45 -05:00
Don Mitchell
1595bd9b0e
Move dnd code from base.js to a js file only loaded by overview.html
2013-02-01 17:20:58 -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
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
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
Chris Dodge
855c8bb7e7
add unit test for tab reordering
2013-01-29 13:44:42 -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
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
