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

6478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
David Ormsbee
96bdd03406 re-enable email change functionality 2012-10-12 09:54:47 -04:00
David Ormsbee
05c5ac3482 Allow people who haven't activated to reset their password. 2012-10-11 11:04:18 -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
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
Victor Shnayder
9496064943 Merge pull request #821 from MITx/feature/rocha/openid-djangostore 
Use django cache for OpenID provider store
 2012-10-05 08:41:18 -07:00
kimth
79996f20a4 Merge pull request #827 from MITx/bug/tomg/vote-button 
changed vote button icon display mode to fight zoom bugs
 2012-10-04 20:07:29 -07:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Tom Giannattasio
69f8734893 changed vote button icon display mode to fight zoom bugs 2012-10-04 14:09:01 -04:00
Calen Pennington
41b0eb9df4 Merge pull request #824 from MITx/feature/tomg/google-analytics 
added google analytics to all pages without a course object
 2012-10-04 07:54:29 -07:00
Calen Pennington
b182b6e43e Merge pull request #823 from MITx/hotfix/rocha/create-dev-for-os-x-10.8 
Fix create-dev-env script for Mac OS 10.8 and latest stable rvm
 2012-10-04 07:45:37 -07:00
Victor Shnayder
5b79352aba Merge pull request #806 from MITx/feature/rocha/support-additional-video-sources 
Add support for video download link
 2012-10-03 17:15:46 -07:00
Tom Giannattasio
33378bbafd added google analytics to all pages without a course object 2012-10-03 19:33:12 -04:00
Carlos Andrés Rocha
2c5047fde4 Fix create-dev-env script for Mac OS 10.8 and latest stable rvm 2012-10-03 19:02:02 -04:00
Carlos Andrés Rocha
e62968d5e1 Get OpenID XRDS url host from request 
Replaced the previous method of getting it from HTTP_POST to use
django's mechanism, which may or may not use HTTP_HOST. However if an
attacker changes the request header, there is not much he can do since
he cannot recreate the association nonce.
 2012-10-03 17:16:22 -04:00
Carlos Andrés Rocha
4840de8c88 Create Django cache backed OpenID provider store 2012-10-03 16:54:07 -04:00
Victor Shnayder
607fdb020b Merge pull request #820 from MITx/ned/spaces_in_codemirror 
Now when you hit the TAB key in codemirror, it will insert 4 spaces.
 2012-10-03 13:24:47 -07:00
Ned Batchelder
52ccfab122 Now when you hit the TAB key in codemirror, it will insert 4 spaces. 2012-10-03 16:19:04 -04:00
Victor Shnayder
b2cc462562 Merge pull request #812 from MITx/feature/victor/status-banner 
Firefox bug fix
 2012-10-03 08:04:39 -07:00
Tom Giannattasio
a15ef161a9 ff bug fix 2012-10-03 10:59:24 -04:00
Victor Shnayder
d042026e68 Merge pull request #809 from MITx/feature/rocha/styling-for-code-responses 
Add styling for code grader responses
 2012-10-03 06:45:28 -07:00
Calen Pennington
a8988c3909 Merge pull request #810 from MITx/bugfix/victor/too-collapsible 
Make collapsibles not collapse the entire page
 2012-10-03 06:32:36 -07:00
Victor Shnayder
85893c77c6 Make collapsibles not collapse the entire page 
- need to set text of the link, not the document
- there was something funny with the operator precedence in the ternary operator (was getting 'true', instead of a string)
 2012-10-03 09:25:57 -04:00