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

6519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
48de4b40ee Fix my js_loader patch 
* still call the callback when skipping duplicate file.  This updates the completed flags, and so the overall "we're done" callback fires properly.
 2012-10-12 22:52:02 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00
arjun810
b2afa82c8e Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2 
more removal of data("id") in favor of attr("data-id")
 2012-10-12 14:59:20 -07:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
Victor Shnayder
d97533c04f Merge pull request #885 from MITx/hotfix/rocha/fix-unicode-in-custom-tabs 
Fix to read utf-8 enconded html files for custom course tabs
 2012-10-12 14:39:15 -07:00
Carlos Andrés Rocha
f1120a1139 Removed unused import 2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701 Fix to read utf-8 enconded html files for custom course tabs 2012-10-12 17:36:19 -04:00
Victor Shnayder
619e9f18ac Merge pull request #884 from MITx/feature/victor/capa-ajax 
address Ike's comments.
 2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac address Ike's comments. 2012-10-12 17:03:11 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
Victor Shnayder
d78e041c2d Testing and small fixes 
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
 2012-10-12 15:32:36 -04:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids 
Hotfix/arjun/fix integer disc ids
 2012-10-12 11:38:28 -07:00
David Ormsbee
73bbfe8c4d Merge pull request #875 from MITx/feature/arjun/community_tas 
styles and tiny bit of logic for community tas
 2012-10-12 11:37:47 -07:00
Victor Shnayder
f6f2663b77 fix arrows list 2012-10-12 14:08:21 -04:00
Victor Shnayder
b6f7427e22 make tests pass again 2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Arjun Singh
c28c3f9916 Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids 2012-10-12 04:23:29 -07:00
Arjun Singh
6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved 2012-10-12 04:22:27 -07:00
Victor Shnayder
c420c67b82 Actually implement exact vs factors-don't-matter comparisons in chemcalc 2012-10-11 17:40:26 -04:00
David Ormsbee
9c0e554992 Merge pull request #855 from MITx/bug/tomg/nested-hints 
tweaked collapsible selector to target the proper section
 2012-10-11 10:25:21 -07:00
David Ormsbee
d0668043a5 Merge pull request #861 from MITx/feature/ichuang/dump_grades 
add django management command for dumping grades to CSV file
 2012-10-11 10:24:19 -07:00
David Ormsbee
c6c51cf19a Merge pull request #865 from MITx/bugfix/victor/progress-tab-crash 
Check for None to fix 3.091 progress tab crash
 2012-10-11 10:22:28 -07:00
Victor Shnayder
a5dcdcb705 Check for None to fix 3.091 progress tab crash 
- get_module() contract says it can return None (e.g. if access control check failed)
 2012-10-11 13:08:05 -04:00
David Ormsbee
4b16a7b422 Merge pull request #863 from MITx/bug/lyla/numerical-tolerance-default 
fixed default tolerance on numericalresponse
 2012-10-11 09:51:29 -07:00
Lyla Fischer
0cdbd170c2 fixed documentation 2012-10-11 12:23:06 -04:00
Lyla Fischer
331f35145f fixed default tolerance on numericalresponse 2012-10-11 11:59:27 -04:00
ichuang
778017fc3e add django management command for dumping grades to CSV file 2012-10-11 11:30:57 -04:00
Victor Shnayder
2b6e935985 Initial refactor of inputtypes into classes. 
- for now, wraps existing render functions as separate classes
- a bit of cleanup in how it's called from capa_problem
- initial tests to make sure things are testable.
 2012-10-11 11:26:49 -04:00
Victor Shnayder
cb291871b1 Better error checking when content authors mess up answers to numerical response problems. 
- give different errors when student or author stuff is messed up (I was seeing "No way to interpret '3' as a number" :P)
- preserve traceback in exception
 2012-10-11 11:25:40 -04:00
Victor Shnayder
8cdd5b35c0 add note about randomization, based on discussion with Piotr 2012-10-11 11:15:58 -04:00
David Ormsbee
88f147c704 Merge pull request #847 from MITx/feature/rocha/openid-djangostore 
Fix openid provider URL matching for usernames with non-word characters
 2012-10-11 08:06:48 -07:00
David Ormsbee
488d001e85 Merge pull request #854 from MITx/feature/bridger/course_grading 
Added an indicator on Progress page when there are no problem scores in a section.
 2012-10-11 08:06:05 -07:00
arjun810
e2f53f1429 Merge pull request #857 from MITx/hotfix/arjun/fix_integer_disc_ids 
Fix some issues with integer ids in the discussion forum
 2012-10-11 07:02:09 -07:00
Arjun Singh
58b0829b79 Fix some issues with integer ids in the discussion forum 2012-10-11 06:22:00 -07:00
Tom Giannattasio
00e2f093b9 removed extra padding on nested sections 2012-10-10 16:19:03 -04:00
Tom Giannattasio
6f60af71fd tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now 2012-10-10 16:14:32 -04:00
Victor Shnayder
db17580710 Chemcalc refactor, improvement 
* Move tests into a separate file
* add a chemical_equations_equal function to compare equations, not expressions
* rename some internal functions with a leading _
 2012-10-10 15:49:09 -04:00
Victor Shnayder
d10b568c13 Add chemcalc to capa package, to context for customresponse 2012-10-10 15:49:09 -04:00
Victor Shnayder
c30f57022b Move more tests around, start prep for inputtype refactor 2012-10-10 15:48:33 -04:00
Bridger Maxwell
e256b2390b Added an indicator on Progress page when there are no problem scores in a section. 2012-10-10 14:53:39 -04:00
Calen Pennington
bb50402b3f Merge pull request #850 from MITx/feature/jarv/staff-account 
Adding django-admin/rake command to set the staff bit
 2012-10-10 06:55:41 -07:00
John Jarvis
bd45dbd8d4 Adding django-admin/rake command to set the staff bit 2012-10-10 09:46:30 -04:00
arjun810
c38aec5ba2 Merge pull request #849 from MITx/kimth/fix-html-js 
Don't function call on null
 2012-10-09 21:16:46 -07:00
kimth
61b3857134 Don't function call on null 2012-10-10 03:46:17 +00:00
Carlos Andrés Rocha
386480905f Fix openid provider URL matching for usernames with non-word characters 2012-10-09 17:48:46 -04:00
David Ormsbee
57e4f0dd6b Merge pull request #839 from MITx/feature/victor/per-course-status 
Feature/victor/per course status
 2012-10-09 08:29:22 -07:00
Victor Shnayder
66604fd0b7 add nltk to requirements 
- needed for chemical equation parsing, which is about to appear in capa
 2012-10-08 16:44:36 -04:00
Victor Shnayder
9e02b3ce34 Move tests around: 
- move progress tests into test_progress.py
- move grader tests into test_graders.py
- move the capa tests into capa/tests/
 2012-10-08 15:52:18 -04:00
Victor Shnayder
bcf835532b Pass course_id instead of course to get_site_status_msg 
* makes testing easier -- don't need course objects
 2012-10-08 14:06:58 -04:00