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

11081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasyl Nakvasiuk
bb69e9fab6 fix dnd tests 2013-03-06 14:30:29 +02:00
Vasyl Nakvasiuk
f71c43f77b fix self.excess_draggables 2013-03-06 14:28:10 +02: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
Vasyl Nakvasiuk
0d83fefecf merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged 2013-03-05 18:20:38 +02:00
Vasyl Nakvasiuk
f87a5fbbbd fix GraphicalSliderToolModule 2013-03-05 14:24:59 +02:00
Vik Paruchuri
cb4a7c663c A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors. 2013-03-04 18:54:52 -05:00
Vik Paruchuri
b5786874ab Wiring through some changes 2013-03-04 18:04:13 -05:00
Vik Paruchuri
77ed921624 Prelim wiring on peer grading and combined open ended xmodules 2013-03-04 17:48:43 -05:00
Vik Paruchuri
02539a3bc8 Start converting COE storage model 2013-03-04 17:06:39 -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
David Ormsbee
9d2a2cbc2f Merge pull request #1555 from MITx/feature/jkarni/foldit-api 
Feature/jkarni/foldit api
 2013-03-04 11:40:43 -08:00
David Ormsbee
b0afbba58d Merge pull request #1516 from MITx/hack/dave/submission_history 
Record and report submission history for a problem
 2013-03-04 11:39:54 -08:00
Victor Shnayder
c0bb4ee22a Merge pull request #1588 from MITx/bugfix/dave/username_space_msg 
Tell user that spaces aren't allowed in usernames (requested by Teppo).
 2013-03-04 10:25:34 -08:00
David Ormsbee
88a30cb733 Fixes in response to Victor's comments. 2013-03-04 13:21:19 -05:00
David Ormsbee
f33c00243f Merge pull request #1591 from MITx/fix/cdodge/optimize-instructor-dashboard 
add performance optimizations (efficiently get all course content) to instructor dashboard
 2013-03-04 09:55:00 -08:00
David Ormsbee
e4f1dab409 Merge pull request #1590 from MITx/fix/cdodge/optimize-progress-summary-page 
add depth parameters when loading course and student-state caches. This ...
 2013-03-04 09:54:49 -08:00
Chris Dodge
b482e2ac21 add performance optimizations (efficiently get all course content) 2013-03-04 12:51:21 -05:00
Chris Dodge
4892897c0d add depth parameters when loading course and student-state caches. This will make fewer (but fatter) queries to the database 2013-03-04 12:03:25 -05:00
David Ormsbee
a00f11c1ff Tell user that spaces aren't allowed in usernames (requested by Teppo). 2013-03-04 11:17:29 -05:00
Carlos Andrés Rocha
9b1ae9f99c Merge pull request #1583 from MITx/fix/ned/clean-ups 
Fix/ned/clean ups
 2013-03-04 08:11:29 -08:00
David Ormsbee
3a748b1e79 Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-04 07:59:30 -08:00
Your Name
a9804a3349 proper tab 2013-03-04 10:57:37 -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
Calen Pennington
908bfa3c09 Remove the old poll module test case 2013-03-04 09:02:59 -05:00
Calen Pennington
ee6c3d6b7e Make advertised_start work when it's not parseable as a date 2013-03-04 09:02:51 -05:00
chrisndodge
999ed17e6d Merge pull request #1585 from MITx/fix/cdodge/fix-broken-test 
need to pass commit parameter
 2013-03-02 18:27:12 -08: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
Kevin Chugh
949c95ea00 better fix 2013-03-02 19:51:59 -05:00
Your Name
32e0c580f0 fix 2013-03-02 19:50:14 -05: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
Victor Shnayder
310ecead36 Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-01 16:13:30 -08:00
Your Name
e1ef6a8323 clean up commments 2013-03-01 16:43:55 -05:00
Your Name
b7a6eadca4 new cohorts tested 2013-03-01 16:33:27 -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
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
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
Victor Shnayder
88bfdd01ce Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice 
Feature/will/move correct mark for multiple choice
 2013-03-01 12:52:26 -08: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
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
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
jkarni
a204bff298 Merge pull request #1576 from MITx/feature/jkarni/newjsme 
Updated version of JSME.
 2013-03-01 11:58:19 -08:00
Julian Arni
3203360e9e Removed console.logs 2013-03-01 14:57:38 -05: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
Julian Arni
b39bbec23e Fixed many more broken references in css 2013-03-01 14:43:28 -05:00