Calen Pennington
ba69392f70
Fix inaccurate instructions around import
2013-03-06 17:10:45 -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
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Calen Pennington
e7900859b6
Remove the 'title' alias for lms.display_name
2013-03-06 15:11:08 -05:00
Brian Talbot
9a7b6c7eaf
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-06 15:04:34 -05:00
cahrens
de225e6623
Enable Django debug toolbar on Studio (including Mongo panel).
2013-03-06 14:08:54 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -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
Calen Pennington
b7680f3157
Fix tests except for conditional module and open ended grading
2013-03-05 15:04:59 -05: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
Brian Talbot
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Brian Talbot
cbdf9ea25b
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
2013-03-05 09:57:14 -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
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -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
Brian Talbot
dd82ea5738
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-04 12:47:23 -05:00
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -05:00
Brian Talbot
eb1658730a
studio - alerts: revised border styling on all elements and button/color inheritance
2013-03-04 12:30:04 -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
Brian Talbot
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
2013-03-03 20:44:48 -05:00
Brian Talbot
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-02 22:11:16 -05:00
Brian Talbot
bc0b1b0958
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
2013-03-02 22:06:55 -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
