Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
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
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
2ce4ecbc84 local merge with master - finished 2013-03-01 15:48:15 -05:00
Brian Talbot
8552b2d614 local merge with master - WIP 2013-03-01 15:47: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
Brian Talbot
ad70581b80 studio - alerts: more progress including prompts 2013-03-01 15:43:07 -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
cahrens
d7c28bfa11 Don't usurp ValidatingView's error handling. 
#219
 2013-03-01 15:24:56 -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
Don Mitchell
5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc 
Bug fix for #215 (quotes not rendering in text fields).
 2013-03-01 12:09:20 -08:00
cahrens
29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc. 
#213
 2013-03-01 14:55:38 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Vik Paruchuri
a818191297 Prelim support for combinedopenended and peergrading types 2013-03-01 14:12:04 -05:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor 
Fix latex high-level source editor in current version of cms / studio
 2013-02-28 10:02:09 -08:00