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

11165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
57700a56d4 remove links to missing image files. We can add them if needed later. 2013-03-06 19:11:36 -05:00
David Ormsbee
5b12793aee Merge pull request #1597 from MITx/docs/valera/drag_and_drop 
Added documentation for drag and drop - targets on draggables feature.
 2013-03-06 14:55:02 -08:00
David Ormsbee
d2f9b27d8e Merge pull request #1611 from MITx/fix/brian/doc-pdfbook 
add textbook and pdf textbook documentation
 2013-03-06 14:54:36 -08:00
Brian Wilson
9c92c92fda add textbook and pdf textbook documentation 2013-03-06 17:35:32 -05:00
jkarni
3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex 
Feature/jkarni/genex
 2013-03-06 14:35:01 -08:00
Jay Zoldak
73bca8afd2 Merge pull request #1610 from MITx/fix/diana/fix-annotation-tests 
Update correctmap to handle partially correct answers, and
 2013-03-06 14:11:47 -08:00
Diana Huang
5c3dfd9280 Update correctmap to handle partially correct answers, and 
fix annotation tests so that they use the new test_system functionality
 2013-03-06 16:43:12 -05:00
chrisndodge
05211d4fe8 Merge pull request #1607 from MITx/feature/christina/djdebug 
Enable Django debug toolbar on Studio (including Mongo panel).
 2013-03-06 13:14:19 -08: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
42e711e7d2 Update tests and documentation. 2013-03-06 14:53:13 -05: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
dfc9176f6b fixed typo 2013-03-06 14:40:35 -05:00
Arthur Barrett
ddbab36439 Added instructions/documentation to the studio template for content authors. 2013-03-06 14:33:04 -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
cahrens
de225e6623 Enable Django debug toolbar on Studio (including Mongo panel). 2013-03-06 14:08:54 -05:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -05:00
Arthur Barrett
fd49aceb29 fixed highlight style for cascade. 2013-03-06 13:36:11 -05:00
Julian Arni
d05e82e35c Merge branch 'master' into feature/jkarni/genex 2013-03-06 13:25:30 -05:00
Arthur Barrett
9b32400b3a tweaked commentary textarea size so it looks correct in ff 2013-03-06 13:18:52 -05: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
Arthur Barrett
0424b53336 show the annotation callout at the span center rather than at the mouse 2013-03-06 00:05:41 -05:00
Arthur Barrett
3393e6385d set a default height on the commentary textbox to show 5 lines of text 2013-03-06 00:05:36 -05:00
Arthur Barrett
2ed7394f27 visually distinguish instructions from guided discussion section 2013-03-06 00:05:28 -05: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