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

3993 Commits

Author SHA1 Message Date
Jay Zoldak
b9e5ed9525 Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00
Victor Shnayder
b0790921a3 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-08 00:43:39 -05:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-03-08 00:40:18 -05:00
Chris Dodge
4c72dbfce3 fix fat fingers? 2013-03-07 22:03:38 -05:00
Brian Talbot
afa704c253 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-07 11:38:07 -05:00
Brian Talbot
559a311acb studio - alerts: refactored static alerts demo view to have a different template/view/url name to help with user facing views vs. documentation views 2013-03-07 11:37:15 -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
Chris Dodge
75872e1d28 remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch... 2013-03-06 22:28:44 -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
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
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
fa3961d4dd merged openended and advanced categories per discussion at today's standup 2013-03-05 10:51:59 -05:00
Brian Talbot
156a702e08 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-05 09:57:35 -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
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
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
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