Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

7051 Commits

Author SHA1 Message Date
Brian Wilson
bed7dbdb6b fix plumbing for anchors and chapters. 2013-03-08 18:25:33 -05:00
Calen Pennington
035829289e Parse weight as a float when reading from a string 2013-03-08 16:01:27 -05:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Chris Dodge
e4dea025d0 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-08 13:53:25 -05:00
Chris Dodge
5e3b084c1a fix regression where wrap_xmodule_display got set to True for 'about' and 'info' 2013-03-08 13:50:58 -05:00
Calen Pennington
79ad2ecd39 Only run setup_debug once the page has finished loading 2013-03-08 13:39:19 -05:00
Calen Pennington
1962d247bf Make allow_anonymous and allow_anonymous_to_peers use field access in templates 2013-03-08 13:23:06 -05:00
Calen Pennington
d8b99e1e8e Make remote_gradebook use the new field instead of metadata 2013-03-08 13:21:58 -05:00
Calen Pennington
4fd1b93692 Fix bad merge in discussion utils 2013-03-08 12:56:17 -05:00
Calen Pennington
8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Calen Pennington
a44c0932d2 Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user 2013-03-08 10:08: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
David Ormsbee
c43d4b3469 re-added Students with correct answers to analytics dashboard 2013-03-07 23:39:10 -05:00
Brian Wilson
49dee5080a first pass at chapter navigation 2013-03-07 18:45:00 -05:00
Valera Rozuvan
8b0c30e69f Fixed small typo. 2013-03-07 17:48:40 +02:00
David Ormsbee
c144795588 Re-enable a couple of analytics on the dashboard to test layout 2013-03-07 10:01:56 -05:00
Jay Zoldak
1b7863e79e Merge pull request #1603 from MITx/fix/will/merge_jnater_unittests 
Fix/will/merge jnater unittests
 2013-03-07 06:47:55 -08:00
Brian Wilson
aee7d85694 fix bug in tabs 2013-03-07 02:01:42 -05:00
Victor Shnayder
5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore 
Hotfix/jkarni/folditscore
 2013-03-06 17:32:29 -08:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation 
Refactor Chemical Equation Preview
 2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Diana Huang
1aa3580dcb Switch over to using the inputtype ajax handler for chemical input. 2013-03-06 14:41:48 -05:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -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
Julian Arni
5682e02f53 Fix indendation that was causing only first submission to be saved 2013-03-06 11:05:10 -05:00
Will Daly
e1b99186ef Removed test_permissions.py 2013-03-06 10:20:02 -05:00
Will Daly
2f5ea630e7 Cleaned up courseware test_tabs unittests 2013-03-06 10:16:43 -05:00
Will Daly
0d1b380008 Removed test_grades.py in courseware django app. 2013-03-06 09:44:53 -05:00
Will Daly
72411a175f Added jnater's unit tests, cleaned up broken tests, ran pep8fix 2013-03-06 09:41:26 -05:00
Calen Pennington
14873e6465 Reorderd xmodule storage migrations 2013-03-06 08:45:32 -05:00
Peter Baratta
c6545eb092 Begin to document symmath as we go 2013-03-06 06:21:08 -07:00
Peter Baratta
b82212ed0c Merge branch 'master' into peter/symbolic 2013-03-06 05:16:34 -07:00
Arthur Barrett
2ed7394f27 visually distinguish instructions from guided discussion section 2013-03-06 00:05:28 -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
35551049ef Merge remote-tracking branch 'origin/feature/vik/fix-oe-storage' into feature/alex/poll-merged 2013-03-05 15:05:47 -05:00
Calen Pennington
b7680f3157 Fix tests except for conditional module and open ended grading 2013-03-05 15:04:59 -05:00
Vik Paruchuri
9475c6edac Address review comments 2013-03-05 14:41:08 -05:00
Victor Shnayder
d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all 
removed un-enroll all button for fear of disaster
 2013-03-05 10:18:30 -08:00
Will Daly
a018b8ac38 Merge pull request #1599 from MITx/feature/deena/testing 
Feature/deena/testing
 2013-03-05 09:48:23 -08:00
Jay Zoldak
b0a018195a Pep8 fixes for tests 2013-03-05 11:53:00 -05:00
Jay Zoldak
cee24c5cb2 Import existing UserFactory 2013-03-05 11:18:07 -05:00
Will Daly
2fd9ccece1 Fixed whitespace issues; removed a test that made no assertions 2013-03-05 09:34:52 -05:00
Will Daly
437aadb28e Cleaned up some tests; deleted skip tests 2013-03-05 09:32:20 -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