Commit Graph

2330 Commits

Author SHA1 Message Date
ichuang
caa14922bb edx4edx configuration running on content server. Notes:
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
2012-06-26 14:04:56 +00:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem)
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -04:00
ichuang
9cea3f971f improved error handling - catch errors around lcp.get_html() 2012-06-24 12:40:56 -04:00
ichuang
84e59a54e6 improved symmath error handling for matrix shape mismatch 2012-06-23 17:05:09 -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
ichuang
62f1717972 add more loncapa check functions (choose, rad2deg, deg2rad) 2012-06-23 16:20:05 -04:00
ichuang
bccdeb2a90 fix quickedit.html for latest css 2012-06-23 16:19:41 -04:00
ichuang
bb5278c63b Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-22 18:28:27 -04:00
Kyle Fiedler
9e8f20104c added styles for ol in html units 2012-06-22 11:17:31 -04:00
ichuang
37539fdd4b revised 8.01x entry in dev_ike 2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f use pipeline 2012-06-21 21:40:41 -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
31226f58b8 updated dogfood to match latest xmodule mods in master 2012-06-21 21:28:21 -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
Kyle Fiedler
184d0ab038 added styles for lists and paragraphs in problems 2012-06-21 15:41:36 -04:00
ichuang
a2e2b6e445 allow javascript in problem xml 2012-06-20 23:37:40 -04:00
ichuang
a892752b89 add 18.06x to dev_ike.py 2012-06-20 22:16:35 -04:00
Victor Shnayder
8ca56ed451 Merge pull request #129 from MITx/victor/progress-bugfix
bugfix: lcp score can apparently be 0/0
2012-06-20 14:29:58 -07:00
Victor Shnayder
95806847d0 bugfix: lcp score can apparently be 0/0 2012-06-20 17:20:34 -04:00
Calen Pennington
cdfae5a005 Merge pull request #128 from MITx/victor/show_student_state
Victor/show student state
2012-06-20 13:12:07 -07: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
85bee9b42b Initial UI for sequence progress.
* change bottom border of links:
  red for not started
  yellow for in_progress
  green for done

* This should probably be designed at some point.
* Obvious problems: the yellow is not very visible, and lots of people are
  red/green color-blind.
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
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Calen Pennington
649b9bd92d Merge pull request #127 from MITx/victor/fix_accordion_again
Fix render of lms index with no chapter or section.
2012-06-20 08:37:25 -07:00
Victor Shnayder
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -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
7710e7a6a4 Merge pull request #125 from MITx/victor/fix_accordion
Fix accordion rendering bug
2012-06-20 05:36:41 -07: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
0ace2ee364 Merge pull request #122 from MITx/cpennington/cms-review-cleanup
Cleanup from https://github.com/MITx/mitx/pull/120
2012-06-20 05:34:36 -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
Victor Shnayder
39c57af849 remove obsolete comment 2012-06-19 16:37:33 -04:00
Victor Shnayder
a6fc27acd6 Fix accordion rendering bug
* needed to clean the chapter and section vars before rendering
2012-06-19 16:19:45 -04:00
Calen Pennington
8e05116d02 Merge pull request #123 from MITx/ps-update-jquery
Update jQuery and jQuery-UI to latest version
2012-06-19 11:36:08 -07:00
Prem Sichanugrist
afaed83158 Update jQuery and jQuery-UI to latest version 2012-06-19 14:31:00 -04:00
Calen Pennington
e865b97269 Rename test directory for consistancy 2012-06-19 14:30:19 -04:00
Calen Pennington
cc22125971 Remove old pre-compiled css 2012-06-19 14:30:19 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 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
b91a1d48b6 Remove reference to instructor module 2012-06-19 11:44:54 -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