Chris Dodge
|
e5ee0a77ed
|
hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection
|
2013-03-12 15:24:10 -04:00 |
|
Chris Dodge
|
bf0e5a2701
|
do a bunch of pylint improvements
|
2013-03-11 21:14:24 -04:00 |
|
Don Mitchell
|
d85f7ac9be
|
Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup
Feature/cdodge/pylint cleanup
|
2013-03-11 12:10:05 -07:00 |
|
Chris Dodge
|
4ec3683c3c
|
clean up some pylint violations
|
2013-03-11 14:57:04 -04:00 |
|
Chris Dodge
|
26f4424581
|
clean up some pylint violations
|
2013-03-11 14:55:37 -04:00 |
|
Chris Dodge
|
78c8358957
|
clean up pyling violations from views.py
|
2013-03-11 14:51:44 -04:00 |
|
Chris Dodge
|
d38b37f0b4
|
delete_item should update the parent's list of children to reflect the delete operation. Also added unit test
|
2013-03-11 10:47:22 -04:00 |
|
Jay Zoldak
|
c5a9ec5e86
|
Speed up the lettuce test for no policy settings.
|
2013-03-08 13:34:28 -05:00 |
|
Jay Zoldak
|
3c3f6c3cbe
|
Revert lettuce css_find function to not fail if it does not find the element.
|
2013-03-08 13:34:28 -05:00 |
|
Jay Zoldak
|
55eefd0ef6
|
Fix test that sets release date to work on all platforms
|
2013-03-08 11:15:15 -05:00 |
|
Jay Zoldak
|
24d088933e
|
Fix intermittent lettuce test failure on ubuntu.
|
2013-03-08 11:15:15 -05:00 |
|
Jay Zoldak
|
21e7bc5128
|
More robust handling for finding and clicking on objects by css.
Tag tests not working under PhantomJS to skip for now.
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
b66d0cf5da
|
Fix signup test on ubuntu
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
ad5d2a9624
|
Update update_templates reference
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
e84fa63826
|
Catch WebDriverException
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
21c15d8f1f
|
Click in the upper left of an element instead of the middle.
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
3cec8f1a76
|
Catch WebDriverException
|
2013-03-08 11:15:14 -05:00 |
|
Jay Zoldak
|
b9e5ed9525
|
Click in the upper left of an element instead of the middle.
|
2013-03-08 11:15:14 -05:00 |
|
Chris Dodge
|
9ba759802c
|
make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue.
|
2013-03-07 10:43:36 -05:00 |
|
Christina Roberts
|
e093431d75
|
Merge pull request #1581 from MITx/feature/vik/advanced-studio
Feature/vik/advanced studio
|
2013-03-05 12:28:29 -08:00 |
|
Vik Paruchuri
|
102c594e7b
|
Remove string and old import
|
2013-03-05 15:01:12 -05:00 |
|
Arthur Barrett
|
5bbb70ef8a
|
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
|
2013-03-05 13:47:02 -05:00 |
|
Will Daly
|
a018b8ac38
|
Merge pull request #1599 from MITx/feature/deena/testing
Feature/deena/testing
|
2013-03-05 09:48:23 -08:00 |
|
Arthur Barrett
|
fa3961d4dd
|
merged openended and advanced categories per discussion at today's standup
|
2013-03-05 10:51:59 -05:00 |
|
Will Daly
|
faf5c3f0a2
|
Updated Deena's tests after merge with master to ensure that none
of the tests fail. Deleted some tests.
|
2013-03-05 09:10:02 -05:00 |
|
cahrens
|
d891361b4a
|
Merge branch 'master' into bug/christina/misc
|
2013-03-05 09:09:08 -05:00 |
|
cahrens
|
b0106a41c7
|
make branch
|
2013-03-04 16:42:04 -05:00 |
|
Will Daly
|
2436d59e14
|
Merge branch 'master' into feature/deena/testing
Conflicts:
cms/djangoapps/contentstore/tests/factories.py
lms/djangoapps/courseware/tests/test_access.py
|
2013-03-04 16:30:41 -05:00 |
|
Don Mitchell
|
ecb136e582
|
Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util
move call to update_templates on service startup into a django-admin com...
|
2013-03-04 13:11:46 -08:00 |
|
Christina Roberts
|
d0eefc6a67
|
Merge pull request #1580 from MITx/bug/dhm/course_update_js
Fix for script tags w/in json objects being oddly evaluated on html page
|
2013-03-04 12:42:42 -08:00 |
|
Don Mitchell
|
020e1e94fb
|
Move side effecting of definition for grader to the course_module and
don't make caller responsible.
|
2013-03-04 15:38:47 -05:00 |
|
Don Mitchell
|
de3a75d29d
|
Don't prepopulate models which may have script tags in their payloads
but fetch async via json get.
|
2013-03-04 12:54:58 -05:00 |
|
Don Mitchell
|
4245816e9e
|
Separate bug on virgin grading policy edits not being persisted b/c the
definition not being updated when using defaults. Not sure why this
passed before.
|
2013-03-04 12:15:28 -05:00 |
|
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 |
|
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 |
|
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 |
|