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

4002 Commits

Author SHA1 Message Date
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
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
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
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
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
David Ormsbee
e1fcf4c317 Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries 
Reduce SQL queries in courseware by model caching a User's groups
 2013-03-01 08:24:30 -08:00
John Hess
b400b575d0 Merge pull request #1567 from MITx/jth/admindash 
Improved /admin_dashboard
 2013-03-01 07:56:32 -08:00
David Ormsbee
1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking 2013-03-01 10:54:57 -05:00
Your Name
8a953241c1 first pass 2013-03-01 10:45:48 -05:00
David Ormsbee
bfe2809a87 Merge branch 'master' into bugfix/dave/too_many_sql_queries 
Conflicts:
	lms/djangoapps/courseware/access.py
 2013-03-01 10:11:35 -05:00
Victor Shnayder
86b91e2dc0 add a question about account changes to the help page 2013-02-28 20:44:18 -05:00
Victor Shnayder
9cde21b591 Update edX media kit (LH #221) 2013-02-28 20:16:19 -05:00
Victor Shnayder
f0a4691914 Update student FAQ (LH #213) 2013-02-28 20:16:06 -05:00
John Hess
02e30f5072 Cleaned up admin_dashboard code and template 2013-02-28 11:11:57 -05:00
John Hess
2f5e1b9cc0 Readable admin_dashboard 2013-02-28 10:54:57 -05:00
David Ormsbee
456972de5c Merge pull request #1562 from MITx/feature/jarv/org-staff-access 
Creating group for organization staff access DO NOT MERGE
 2013-02-28 06:53:56 -08:00
Victor Shnayder
f33c575412 Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff 
fix viewing of pdfbook on firefox
 2013-02-27 15:25:36 -08:00
Brian Wilson
907cd50503 fix viewing of pdfbook on firefox 2013-02-27 17:09:50 -05:00
John Jarvis
48242d3a06 Adding instructor_<org> 2013-02-27 15:30:07 -05:00
Victor Shnayder
8543235306 Merge pull request #1558 from MITx/fix/will/symmath_check_unit_tests 
Added additional unit tests for symmath library that verify symmath_check for simple symbolic input strings.
 2013-02-27 12:19:47 -08:00
John Jarvis
ce2f1400e6 formatting 2013-02-27 15:05:02 -05:00
John Jarvis
7c0d9ff156 Creating group for organization staff access 2013-02-27 14:55:17 -05:00
David Ormsbee
c7920f09ad Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features. 2013-02-27 11:42:06 -05:00
Will Daly
e65a017c74 Added additional unit tests for symmath library that verify 
symmath_check for simple symbolic input strings.
 2013-02-27 10:19:02 -05:00
Ned Batchelder
f828049043 Change TorontoX to University of TorontoX 2013-02-27 10:05:58 -05:00
David Ormsbee
51a863bd6b Merge pull request #1557 from MITx/feature/brian/pdfchapter 
Feature/brian/pdfchapter
 2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef use same images for prev/next as used in image-based textbooks 2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5 update styling of pdfs to be more like textbooks 2013-02-26 15:19:23 -05:00
Julian Arni
b6f3042c1d Incorporate Victor's suggestions 2013-02-26 12:38:09 -05:00
Julian Arni
adaa8463e3 Removed commented-out fn 2013-02-26 10:03:20 -05:00
VikParuchuri
df01064e77 Merge pull request #1536 from MITx/diana/rubric-hot-keys 
Add in rubric hotkeys
 2013-02-26 06:46:26 -08:00
Brian Wilson
fc9ab346e1 fix loading of specific pages. 2013-02-26 01:03:01 -05:00
Julian Arni
414c62115c Fixed tests and list check 2013-02-25 20:12:33 -05:00
Julian Arni
b4387b287d Adding migrations 2013-02-25 18:56:58 -05:00
Julian Arni
3473a5d3b0 Fixed broken reference 2013-02-25 18:39:59 -05:00
Will Daly
850d9846f8 Fixed an error in symmath_check that occurred when 
the expected result = 0.  symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.

Added test_symmath_check.py with basic tests for
the symmath_check() function.
 2013-02-25 18:34:35 -05:00
Julian Arni
edba0978cf Included styling and template 2013-02-25 18:18:46 -05:00