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

6497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07: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
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
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
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
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
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
ichuang
4f29d08400 Merge pull request #841 from MITx/victor/capa_cleanup 
Victor/capa cleanup

Looks good.  Yes, the code exec part will need more thought, particularly with respect to security.
 2012-10-08 10:31:19 -07:00
Victor Shnayder
61e574ee22 Revert "Make script type checking more strict" 
Don't want to break existing problems.

This reverts commit 811422a18d.
 2012-10-08 13:05:30 -04:00
Victor Shnayder
811422a18d Make script type checking more strict 
- check for known script type instead of ignoring js and perl
 2012-10-08 10:59:39 -04:00
Victor Shnayder
3765226b85 shorter impl of is_file 2012-10-08 10:58:59 -04:00
Victor Shnayder
ef1dda67b3 formatting in xqueue_interface.py 2012-10-08 10:58:38 -04:00
Victor Shnayder
93cc9a8e5b formatting cleanup in responsetypes and inputtypes 2012-10-08 10:58:04 -04:00
Victor Shnayder
405012587d formatting 2012-10-08 10:55:45 -04:00
Victor Shnayder
bd7c00ea22 formatting cleanup in correctmap.py 2012-10-08 10:55:30 -04:00
Victor Shnayder
775456b987 formatting cleanups in capa_problem.py 2012-10-08 10:54:59 -04:00
Victor Shnayder
c3e07660df formatting cleanup in calc.py 2012-10-08 10:51:37 -04:00
Victor Shnayder
ddcd166b72 make tests pass without LMS settings 2012-10-07 23:09:26 -04:00
Victor Shnayder
9e43664498 Add support for per-course site status. 
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.

fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
 2012-10-07 23:09:26 -04:00
David Ormsbee
242dd4f7ce Merge pull request #838 from MITx/feature/bridger/course_grading 
Added starting_index conf to AssignmentFormatGrader.
 2012-10-06 19:02:42 -07:00
Bridger Maxwell
62400c4c92 Added starting_index conf to AssignmentFormatGrader. Added a bit of forwards compatibility for new grading policies. 2012-10-06 14:52:48 -04:00
Victor Shnayder
36917b0036 Merge pull request #829 from MITx/feature/tomg/ie-banner 
added ie warning banner to courseware; displayed by ie conditional style...
 2012-10-05 13:53:15 -07:00
Victor Shnayder
67711bedca Merge pull request #837 from MITx/hotfix/rocha/create-dev-for-os-x-10.8 
Set git push.default to current on the create-dev-env script
 2012-10-05 13:42:24 -07:00
Carlos Andrés Rocha
c337848954 Set git push.default to current on the create-dev-env script 2012-10-05 16:23:39 -04:00
Victor Shnayder
7e304abec2 Merge pull request #833 from MITx/feature/rocha/openid-djangostore 
Fix error when creating empty associations
 2012-10-05 10:57:45 -07:00
Victor Shnayder
82d3adc5fb Merge pull request #831 from MITx/feature/victor/code-output-style 
move output right/wrong image to top left of each test instead of center
 2012-10-05 10:49:51 -07:00
Carlos Andrés Rocha
193ca7b34b Fix error when creating empty associations 
Also renamed some variables to make them more distinguishable
 2012-10-05 13:46:49 -04:00
Victor Shnayder
8578320e3d move output right/wrong image to top left of each test instead of center 2012-10-05 13:06:26 -04:00
Victor Shnayder
4fd530dbac fix python syntax in template for adding google analytics 2012-10-05 11:49:17 -04:00