Ned Batchelder
|
7c8a90229e
|
Use 'is None' and 'is not None'
|
2013-03-04 10:57:25 -05:00 |
|
Ned Batchelder
|
97f1e04282
|
Fix some 2-space indents
|
2013-03-04 10:57:25 -05:00 |
|
Chris Dodge
|
f21ff7bbfa
|
update comment
|
2013-03-04 09:15:53 -05:00 |
|
Chris Dodge
|
f057ec5a04
|
add new file to commit
|
2013-03-04 08:29:56 -05:00 |
|
Chris Dodge
|
2d44f51cbc
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/make-update-templates-django-admin-util
|
2013-03-04 08:08:51 -05:00 |
|
Chris Dodge
|
6bacbafb6f
|
move call to update_templates on service startup into a django-admin command
|
2013-03-04 08:06:58 -05:00 |
|
Brian Talbot
|
47aacc70b7
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-02 22:11:16 -05:00 |
|
Chris Dodge
|
3f9bc86c9e
|
need to pass commit parameter
|
2013-03-02 21:26:24 -05:00 |
|
chrisndodge
|
f543ad4932
|
Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance
do the metadata comparison on the parent not the course as we don't actu...
|
2013-03-02 18:02:34 -08:00 |
|
Chris Dodge
|
bcea53d4b7
|
do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary).
|
2013-03-02 19:36:11 -05:00 |
|
chrisndodge
|
c236b2c8a9
|
Merge pull request #1550 from MITx/feature/cdodge/add-test-delete
add another command line argument to allow users to only simulate a dele...
|
2013-03-01 13:29:06 -08:00 |
|
Vik Paruchuri
|
f8b0338dee
|
Change name of annotatable, add in sass for advanced module
|
2013-03-01 16:26:48 -05:00 |
|
Vik Paruchuri
|
a2c03fec15
|
Make parsing more robust
|
2013-03-01 16:19:16 -05:00 |
|
Chris Dodge
|
20540fbc2d
|
update usage feedback
|
2013-03-01 15:52:27 -05:00 |
|
Chris Dodge
|
0047295695
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete
|
2013-03-01 15:48:23 -05:00 |
|
Brian Talbot
|
8552b2d614
|
local merge with master - WIP
|
2013-03-01 15:47:23 -05:00 |
|
Vik Paruchuri
|
7a8e43a9c5
|
Json parsing fixes
|
2013-03-01 15:40:46 -05:00 |
|
Vik Paruchuri
|
386ab10edb
|
Apparently meld is weird at indenting
|
2013-03-01 15:31:42 -05:00 |
|
Vik Paruchuri
|
a09a4febce
|
Fix category generation
|
2013-03-01 15:30:22 -05:00 |
|
Vik Paruchuri
|
fb37d46bd8
|
Minor bugfixes
|
2013-03-01 15:28:33 -05:00 |
|
Vik Paruchuri
|
d039776218
|
Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio
Conflicts:
cms/djangoapps/contentstore/views.py
|
2013-03-01 15:25:53 -05:00 |
|
Chris Dodge
|
724c6c9eaa
|
reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident.
|
2013-03-01 15:25:36 -05:00 |
|
Arthur Barrett
|
67b73242ea
|
added advanced component button with ability to specify components in course policy.
|
2013-03-01 15:11:42 -05:00 |
|
Vik Paruchuri
|
9f020e228b
|
Add in some dummy values
|
2013-03-01 14:50:40 -05:00 |
|
Vik Paruchuri
|
a818191297
|
Prelim support for combinedopenended and peergrading types
|
2013-03-01 14:12:04 -05:00 |
|
Chris Dodge
|
8a7211da05
|
remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument.
|
2013-02-28 09:40:30 -05:00 |
|
Chris Dodge
|
905199b5eb
|
restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive.
|
2013-02-27 22:37:13 -05:00 |
|
Carlos Andrés Rocha
|
2ca303c95d
|
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
|
2013-02-27 09:02:07 -08:00 |
|
Don Mitchell
|
d2e6f6dccb
|
Fixes for code review comments
|
2013-02-26 13:56:00 -05:00 |
|
Chris Dodge
|
816b0edfb0
|
add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker.
|
2013-02-25 16:00:35 -05:00 |
|
Brian Talbot
|
d809df913d
|
studio - alerts: moved all states and documentation into new /alerts view
|
2013-02-25 14:45:27 -05:00 |
|
Jay Zoldak
|
3a6f43f320
|
Create additional BDD spec tests for Course Advanced Settings editor
|
2013-02-22 16:27:05 -05:00 |
|
Jay Zoldak
|
85b75badd7
|
Refactor lettuce commands for navigation to the advanced settings page
|
2013-02-22 14:07:22 -05:00 |
|
Jay Zoldak
|
af2690fcaf
|
Update lettuce test framework to use a course factory instead of the studio UI for creating courses
|
2013-02-22 12:36:27 -05:00 |
|
Jay Zoldak
|
e337292b5f
|
Fix existing advanced settings lettuce tests.
|
2013-02-21 18:20:42 -05:00 |
|
Victor Shnayder
|
8d76556729
|
Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings
Fix/cdodge/serializing ints as empty strings
|
2013-02-21 12:12:44 -08:00 |
|
Jay Zoldak
|
9eb2766943
|
Change test modulestore naming differentiation scheme to uuid
|
2013-02-21 13:07:14 -05:00 |
|
Chris Dodge
|
bc1ee3dbfa
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
|
2013-02-21 12:56:20 -05:00 |
|
Chris Dodge
|
041d28f0e9
|
use better variable names to assert that the expected item was indeed loaded
|
2013-02-21 12:56:17 -05:00 |
|
Chris Dodge
|
fa3402a977
|
template name got changed. Need to reflect that on test.
|
2013-02-21 12:25:10 -05:00 |
|
Chris Dodge
|
bb75a23101
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
|
2013-02-21 11:58:52 -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
|
a7f6545cbc
|
add unit test
|
2013-02-21 11:22:20 -05: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 |
|
cahrens
|
c572ba862a
|
Delete unused method.
|
2013-02-20 15:47:07 -05:00 |
|
cahrens
|
d9fb067355
|
Test point for formatting of JSON entry.
|
2013-02-20 15:34:53 -05:00 |
|
Brian Talbot
|
7b60ec380a
|
Merge branch 'master' into feature/cas/manual-policy-merged
|
2013-02-20 14:58:50 -05:00 |
|
Jay Zoldak
|
05f32f4bc9
|
Update tests for the advanced policy settings feature.
Includes adding a method for css_click_at.
|
2013-02-20 14:30:39 -05:00 |
|