Commit Graph

1248 Commits

Author SHA1 Message Date
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
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc
lms required grace period fields to be in specific order
2013-02-12 12:42:53 -08:00
Don Mitchell
76d675ba16 fix npe for time (bug 185) 2013-02-12 15:20:02 -05:00
Don Mitchell
8e213fb0d7 lms required grace period fields to be in specific order 2013-02-12 13:48:54 -05:00
Calen Pennington
23bb87e0bb Merge pull request #1486 from MITx/feature/ned/clean_up_tests
We no longer need override_settings, Django has a better one.
2013-02-12 07:22:27 -08:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Christina Roberts
f18618e35b Merge pull request #1482 from MITx/bug/dhm/misc
bug 155
2013-02-11 13:46:20 -08:00
Don Mitchell
8bc9564d92 clean up note to self 2013-02-11 16:45:36 -05:00
Don Mitchell
777e0ef9c5 The other one was too inclusive 2013-02-11 16:36:34 -05:00
Don Mitchell
565f5f0adc Stop simple clicks from paging to top w/o disrupting dnd 2013-02-11 16:28:22 -05:00
Christina Roberts
14234c8106 Merge pull request #1481 from MITx/bug/dhm/misc
Bug 180
2013-02-11 13:23:08 -08: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
Don Mitchell
ae4a854e18 Bug 180 2013-02-11 15:46:58 -05: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
chrisndodge
891e350a83 Merge pull request #1464 from MITx/bug/bug161
On first request for handouts, create the db record. (bug 160)
2013-02-08 10:49:01 -08:00
cahrens
98026e4325 A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
Don Mitchell
fa5537ab71 On first request for handouts, create the db record. (bug 160) 2013-02-07 17:09:57 -05:00
Don Mitchell
48e582647c bug 171 2013-02-07 16:24:43 -05:00
Don Mitchell
70560d2237 Put DnD back into edit_subsection page 2013-02-07 10:41:37 -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
b329b0ea42 Remove toy dbs from CMS test settings.py file as they are not used. 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
David Ormsbee
e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic
Free courses from the confines of collectstatic
2013-02-05 10:32:54 -08:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 2013-02-05 11:06:46 -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
Brian Talbot
ffd585ae56 studio - resolved safari/webkit display issue with unit editing window's wrapper background color 2013-02-04 14:44:17 -05:00
Brian Talbot
6ca55b8458 studio - overview drag and drop: removed unused scss and hid new unit button while dragging 2013-02-04 14:35:04 -05:00
Don Mitchell
902cdefefa Added comments for unused 2nd arg on generateCheckHoverState 2013-02-04 12:05:49 -05:00
Don Mitchell
50eced5b32 Attempt to patch the dnd hesitation fixes onto master 2013-02-04 11:34:59 -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
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00