Chris Dodge
|
fa3402a977
|
template name got changed. Need to reflect that on test.
|
2013-02-21 12:25:10 -05:00 |
|
David Ormsbee
|
3494d58450
|
Merge pull request #1532 from MITx/feature/ned/clean_up_tests
Make sure temp directories are properly cleaned up so running tests does...
|
2013-02-21 08:52:09 -08:00 |
|
Ned Batchelder
|
c3b571bf9b
|
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
|
2013-02-21 11:38:45 -05:00 |
|
Don Mitchell
|
ba7959fc4d
|
Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling
Feature/cdodge/metadata inheritence crawling
|
2013-02-21 08:29:54 -08:00 |
|
Chris Dodge
|
bd188f92ef
|
put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case
|
2013-02-20 16:20:39 -05:00 |
|
Christina Roberts
|
52caae2fee
|
Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome
Adding in Studio Page headers and actions + help text
|
2013-02-20 06:44:16 -08:00 |
|
Jay Zoldak
|
db6fa9a3aa
|
Pep8fix lettuce test code
|
2013-02-19 16:46:32 -05:00 |
|
Jay Zoldak
|
8c423da6db
|
Updated test to reflect new class name for course titles.
|
2013-02-19 13:50:40 -05:00 |
|
Jay Zoldak
|
301d58d648
|
Update lettuce test with new button name for add new section.
|
2013-02-19 13:31:11 -05:00 |
|
Brian Talbot
|
585dff521a
|
Merge branch 'master' into feature/btalbot/studio-pagechrome
|
2013-02-19 12:27:49 -05:00 |
|
cahrens
|
596de8ab2c
|
Hook up "View Live" buttons and get "New Static Tab" working again.
|
2013-02-19 11:34:41 -05:00 |
|
Chris Dodge
|
1a2e794126
|
add test of inheritance on xmodule insert
|
2013-02-19 09:51:07 -05:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Brian Talbot
|
93949ab342
|
resolving local merge problem
|
2013-02-15 14:12:46 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
Brian Talbot
|
6c95460761
|
studio - resolving merge from master
|
2013-02-15 09:15:06 -05:00 |
|
Don Mitchell
|
bfcc0559a7
|
Merge pull request #1503 from MITx/fix/cdodge/export-policy-json
add exporting of policy.json
|
2013-02-14 12:47:37 -08:00 |
|
Chris Dodge
|
ea068d4aa8
|
add exporting of policy.json
|
2013-02-14 14:19:38 -05:00 |
|
Don Mitchell
|
6e5968e2cd
|
html changed; so, removed mostly meaningless comparison and fixed one.
|
2013-02-13 11:53:26 -05:00 |
|
Don Mitchell
|
6f3a954d7b
|
howitworks is default home page if not logged in. Otherwise course
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
|
2013-02-13 09:30:54 -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 |
|
Don Mitchell
|
d569c559ca
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
|
2013-02-12 16:57:00 -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 |
|
Don Mitchell
|
9cd1162a60
|
Grading and details split out. Put the unimplemented tabs into a single
file not used.
|
2013-02-07 14:45:24 -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 |
|
Don Mitchell
|
0f5571f499
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-06 09:48:09 -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 |
|
Brian Talbot
|
ecbe297936
|
studio - soft landing UI: how it works pathing, html and basic layout styling
|
2013-02-04 09:39:36 -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 |
|