Don Mitchell
49db56ab7d
Merge pull request #1618 from MITx/bug/christina/misc
...
New version of Backbone has separate invalid event.
2013-03-07 11:02:52 -08:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
chrisndodge
19eb6a3449
Merge pull request #1617 from MITx/bug/christina/misc
...
Disable Django toolbar-- breaking mongo updates.
2013-03-07 08:31:44 -08:00
cahrens
4434ca632e
Disable Django toolbar-- breaking mongo updates.
2013-03-07 11:30:00 -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
chrisndodge
05211d4fe8
Merge pull request #1607 from MITx/feature/christina/djdebug
...
Enable Django debug toolbar on Studio (including Mongo panel).
2013-03-06 13:14:19 -08:00
cahrens
de225e6623
Enable Django debug toolbar on Studio (including Mongo panel).
2013-03-06 14:08:54 -05:00
cahrens
b706d4a1f5
Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
...
#225
2013-03-06 11:50:23 -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
c9b2a6a203
updated CSS to use the new advanced icon
2013-03-05 10:52:39 -05:00
Arthur Barrett
fa3961d4dd
merged openended and advanced categories per discussion at today's standup
2013-03-05 10:51:59 -05:00
Brian Talbot
ef9f963f49
studio - advanced modules: added in advanced module button icon per artie/vik work
2013-03-05 10:39:21 -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
Brian Talbot
cc3b9557f9
studio - open ended and annotations: added in component button icon assets and styling
2013-03-04 17:02:59 -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
Don Mitchell
afc2d66d07
Merge pull request #1578 from MITx/bug/christina/misc
...
Don't usurp ValidatingView's error handling.
2013-03-01 13:16:45 -08:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
David Ormsbee
bba96ee1d7
Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base
...
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
2013-03-01 12:59:02 -08: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
chrisndodge
7fa77769c8
Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms
...
turn on tracking in CMS / Studio
2013-03-01 12:47:01 -08: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
