Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,411 Commits 1 Branch 0 Tags
23128ced67c5f38389dbedc6285d18d135836613
Commit Graph

111 Commits

Author SHA1 Message Date
ichuang
7f4ebcb6a9 pep8 fixes - inputtypes 2012-06-29 23:22:40 -04:00
ichuang
fedf216bde Exception, err -> Exception as err 2012-06-29 23:18:58 -04:00
ichuang
547e19625a exception as err 2012-06-29 23:09:26 -04:00
ichuang
0f1ae7f03b Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-29 16:22:49 -04:00
ichuang
8283636e39 inputtypes: if externalresponse server message is bad, don't crash 2012-06-29 14:50:11 -04:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
ichuang
3f60c76fad Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx 2012-06-27 19:14:32 -04:00
ichuang
a988452d4d Merge pull request #132 from MITx/kf-problems 
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes.  The table borders can be fixed in another round.
 2012-06-25 19:14:12 -07:00
ichuang
9cea3f971f improved error handling - catch errors around lcp.get_html() 2012-06-24 12:40:56 -04:00
ichuang
7814805c1a improve capa error handling a bit - for better user experience 
- if no answer given, then symbolicresponse + customrepsonse now
  give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
  alert with useful error message
 2012-06-23 16:23:27 -04:00
David Ormsbee
f041fc4a0b Merge pull request #135 from MITx/cpennington/cms-editing 
Roundtrip HTML module editing working in the CMS
 2012-06-22 10:06:51 -07:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
5bef1e14b2 Split problem metadata out from problem editing contents when rendering 2012-06-22 09:21:09 -04:00
Calen Pennington
17a4d7fd09 Call js module name dynamically, rather than statically calling the HTML module 2012-06-22 08:59:53 -04:00
ichuang
3cd02f6edc Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 21:31:36 -04:00
ichuang
93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 16:46:56 -04:00
Kyle Fiedler
82023f6bd3 Added styles for more basic html elements and reworked design of textinput 2012-06-21 15:41:36 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Victor Shnayder
bf8e70f94e check whether requestcontext exists before access 2012-06-21 11:28:02 -04:00
ichuang
a2e2b6e445 allow javascript in problem xml 2012-06-20 23:37:40 -04:00
Victor Shnayder
95806847d0 bugfix: lcp score can apparently be 0/0 2012-06-20 17:20:34 -04:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup. 
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
 2012-06-20 16:04:03 -04:00
Victor Shnayder
e5a791e031 Add scaffolding comments for progress tracking in video modules. 2012-06-20 16:04:03 -04:00
Calen Pennington
1b7b7e91e4 Merge branch 'master' into cpennington/cms-editing 2012-06-20 15:07:15 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
e9d5f85745 Merge pull request #115 from MITx/capa-include 
modify capa_problem to add <include file="foo"> functionality
 2012-06-20 07:34:19 -07:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking 
Victor/progress tracking
 2012-06-20 07:33:48 -07:00
Victor Shnayder
e872f31835 minor edits to address Calen's comments. 2012-06-20 10:31:37 -04:00
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07:00
Calen Pennington
ed6a658afe Add note about optional revision in location 2012-06-20 08:33:46 -04:00
Victor Shnayder
b963d8b534 Initial progress display. 
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
  - Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler

* Coffeescript changes to hook up sequence tracking of problem progress

* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
 2012-06-19 18:28:45 -04:00
Victor Shnayder
a126935369 Add Progress class and tests 2012-06-19 18:25:13 -04:00
Calen Pennington
e865b97269 Rename test directory for consistancy 2012-06-19 14:30:19 -04:00
Calen Pennington
282372736d Add comment about None in Locations 2012-06-19 14:24:14 -04:00
Calen Pennington
47bf71ae10 Remove extra word in doc string 2012-06-19 14:17:05 -04:00
Calen Pennington
7914baccaa Change name of XModuleSystem to DescriptorSystem at usage sites 2012-06-19 11:36:22 -04:00
Calen Pennington
6fb35c4773 Cleanup intertwined descriptor and keystore code 2012-06-19 11:31:13 -04:00
Calen Pennington
5562def5b7 Add documentation of mongo query syntax usage 2012-06-19 11:29:48 -04:00
Calen Pennington
677c25ee68 Remove unused code 2012-06-19 11:29:14 -04:00
Calen Pennington
f1ffff1dc0 Cleanup and test Location, and add the ability to specify a revision 2012-06-19 11:29:13 -04:00
Calen Pennington
ef6630d733 Merge pull request #120 from MITx/cpennington/cms 
CMS Beginnings
 2012-06-18 13:01:39 -07:00
Calen Pennington
f8434b3a6d Move libraries that can only be imported in the context of django into common/djangoapps 2012-06-18 13:48:26 -04:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms 
Conflicts:
	rakefile
	requirements.txt
 2012-06-18 13:46:33 -04:00
Calen Pennington
79e81d69b4 Delay initializition of the MongoKeyStore until required 2012-06-18 13:41:53 -04:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Piotr Mitros
f391e9c51c Courseware can have same random seed in multiple problems for exam. Slight hack. 2012-06-18 12:10:44 -04:00
Calen Pennington
e67dfb70e4 Add categories and XModuleDescriptors for all module types that are used at the top level of a course 2012-06-18 11:22:36 -04:00
Calen Pennington
fe45de3833 Read week headings from mongodb 2012-06-18 11:20:57 -04:00
ichuang
748398fca1 for externalresponse - fallback to script code if <answer> code not provided 2012-06-17 22:36:39 -04:00
ichuang
ce74f9779f modify capa_problem to add <include file="foo"> functionality 2012-06-15 22:40:02 -04:00