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

11082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
c43d4b3469 re-added Students with correct answers to analytics dashboard 2013-03-07 23:39:10 -05:00
David Ormsbee
c144795588 Re-enable a couple of analytics on the dashboard to test layout 2013-03-07 10:01:56 -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
Victor Shnayder
7af36eb633 Merge pull request #1598 from MITx/diana/capa-input-ajax 
Give InputTypes the ability to handle their own AJAX
 2013-03-06 11:30:28 -08:00
Don Mitchell
69601047f2 Merge pull request #1605 from MITx/bug/christina/misc 
Use readonly attribute instead of disabled. Disabled text fields are not...
 2013-03-06 08:59:11 -08:00
cahrens
b706d4a1f5 Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox. 
#225
 2013-03-06 11:50:23 -05:00
Diana Huang
4b7d1deb25 Fix a bug in extracting HTML 
Update tests to reflect new behavior.
 2013-03-06 10:34:57 -05:00
Diana Huang
455dea870f Remove unnecessary import. 2013-03-06 09:21:37 -05:00
Diana Huang
78424e1670 Fix some of the tests so that they work with the new changes 
to capa_problem
 2013-03-06 09:19:22 -05:00
Diana Huang
17680a332a More comments. 2013-03-06 09:06:43 -05:00
Diana Huang
9b640aa06b Add more documentation and fix naming. 2013-03-06 09:06:43 -05:00
Diana Huang
385a62d7d1 Handle multiple inputs properly for ajax handling. 2013-03-06 09:06:43 -05:00
Diana Huang
6f535d9e0b Fix test rendering so we can parse the problem during tests without it breaking. 2013-03-06 09:06:43 -05:00
Diana Huang
9545a82ab9 Add the ability to make ajax calls on the input type of capa problems. 2013-03-06 09:04:54 -05:00
Diana Huang
f8adfc6244 Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests 
Fix/will/capa xmodule unit tests
 2013-03-06 06:03:17 -08:00
Brian Wilson
cde4cdf839 starting pdfbook doc 2013-03-05 17:51:44 -05:00
Will Daly
c7d80a91ee Changed name of survey_question to is_survey_question for clarity 2013-03-05 17:30:38 -05:00
Will Daly
43d8574e92 Refactored use of test_system in xmodule unit tests 
so that a new one is created for each test
 2013-03-05 17:26:15 -05:00
Will Daly
73281a43c9 Added tests for get_problem_html, including error conditions 2013-03-05 17:02:12 -05:00
Will Daly
40d7e8addf Moved problem HTML error handling to its own function 2013-03-05 15:43:47 -05:00
Will Daly
608552429f Refactored capa module HTML rendering, isolating logic for 
determining which buttons to show
 2013-03-05 15:35:14 -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
Vik Paruchuri
102c594e7b Remove string and old import 2013-03-05 15:01:12 -05:00
Vik Paruchuri
9475c6edac Address review comments 2013-03-05 14:41:08 -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
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
Will Daly
42043d2ccc Added tests for capa module save_problem() 2013-03-05 12:01:04 -05:00
Jay Zoldak
b0a018195a Pep8 fixes for tests 2013-03-05 11:53:00 -05:00
Will Daly
6ec3b94d0c Added test for capa module closed() method; modified 
closed() to handle edge cases
 2013-03-05 11:47:41 -05:00
Will Daly
49784009d5 Fixed incorrect doc string 2013-03-05 11:23:14 -05:00
Will Daly
21af0493fd Added unit tests for capa_module reset_problem() 2013-03-05 11:21:28 -05:00
Jay Zoldak
cee24c5cb2 Import existing UserFactory 2013-03-05 11:18:07 -05:00
chrisndodge
692c423634 Merge pull request #1600 from MITx/bug/christina/misc 
Don't collapse multiple underscores for asset names.
 2013-03-05 08:15:54 -08:00
cahrens
cc234d45e7 Don't collapse multiple underscores for asset names. 
#202
 2013-03-05 10:55:27 -05:00
Arthur Barrett
c9b2a6a203 updated CSS to use the new advanced icon 2013-03-05 10:52:39 -05:00
Arthur Barrett
fa3961d4dd merged openended and advanced categories per discussion at today's standup 2013-03-05 10:51:59 -05:00
Christina Roberts
5b3158444e Merge pull request #1595 from MITx/bug/christina/misc 
Selenium tests to go with pull request 1577 (bug #216)
 2013-03-05 07:50:15 -08:00
Brian Talbot
ef9f963f49 studio - advanced modules: added in advanced module button icon per artie/vik work 2013-03-05 10:39:21 -05:00
Vik Paruchuri
d03fe79e07 Small metadata naming fix 2013-03-05 10:36:22 -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
cahrens
d891361b4a Merge branch 'master' into bug/christina/misc 2013-03-05 09:09:08 -05:00
chrisndodge
59250225d9 Merge pull request #1592 from MITx/fix/cdodge/optimize-instructor-dashboard 
additional courseware view optimizations. Do a 'depth' fetch on the sele...
 2013-03-04 17:19:53 -08:00
Chris Dodge
6ce3493f00 add comment 2013-03-04 19:59:18 -05:00
Victor Shnayder
a58e7c7a26 Merge pull request #1596 from MITx/jth/admindash 
Cast cursor responses as lists.  MySQL returns them as tuples.
 2013-03-04 15:39:09 -08:00
John Hess
94db91fcef Cast cursor responses as lists. MySQL returns them as tuples. 
Removed print statemetns
Moved import call to top of file
 2013-03-04 18:19:24 -05:00
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