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

24365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
75f8b7c98d Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates) 2012-10-10 12:42:14 -04:00
Александр
42bd9e8b9e added test information 2012-10-10 19:36:03 +03:00
Александр
c4359b6f24 added crystresponse 2012-10-10 19:35:09 +03: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
Tom Giannattasio
5fd912baa9 moved component editor to top; polished editor styles 2012-10-10 09:41:47 -04:00
Tom Giannattasio
6d7fff1f50 fixed occassional stacking glitch on header 2012-10-10 09:41:47 -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
Calen Pennington
6079c57111 Merge pull request #846 from MITx/feature/tomg/waiting-class 
waiting class added
 2012-10-09 12:39:10 -07:00
Tom Giannattasio
9cb6331c06 removed users template 2012-10-09 15:32:23 -04:00
Calen Pennington
008b8a686d Merge pull request #844 from MITx/feature/cdodge/cms-unified-user-database 
adhere to the naming conventions of user groups (instructor_* and staff_...
 2012-10-09 12:29:30 -07:00
Tom Giannattasio
002f813b75 pulled spinner out into its own class in case we need to add it directly 2012-10-09 15:28:53 -04:00
Tom Giannattasio
2441f8960e added waiting classes 2012-10-09 15:26:12 -04:00
Chris Dodge
a80e8ce3d5 respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS 2012-10-09 15:11:07 -04:00
Tom Giannattasio
d65e1876a0 tweaked items in the header; tried creating class drop, but can't get the server-side jazz figured out 2012-10-09 14:48:02 -04:00
Tom Giannattasio
4c50f13e99 added templates/styles for static pages 2012-10-09 14:47:15 -04:00
Tom Giannattasio
eb2fadb639 added static page templates; urls will probably need some reworking, but i wanted to get the templates in there 2012-10-09 14:45:56 -04:00
Chris Dodge
68945fdc77 adhere to the naming conventions of user groups (instructor_* and staff_* of the LMS AuthZ implementation). While we're keeping our authz.py implementation - which is duplicative of LMS's access.py - in order to minimize code churn/risk-of-regression, there is data compatibility so the two systems will interpret the data the same way 2012-10-09 13:14:31 -04:00
Александр
708c11a1ea added input type 2012-10-09 19:13:54 +03: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
Chris Dodge
d57aa31545 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-09 10:32:17 -04:00
Chris Dodge
20a8395f4f add/remove policy data from subsection 2012-10-09 10:32:12 -04:00
Calen Pennington
f43c340c2b Merge pull request #835 from MITx/feature/tomg/cas-toast 
added toast notification styles and basic js implementation
 2012-10-09 06:25:03 -07:00
Tom Giannattasio
446915189f added toast notification styles and basic js implementation 2012-10-09 09:15:10 -04:00
Calen Pennington
5df71a0c3e Merge pull request #836 from MITx/feature/tomg/cms-ff-styles 
cross-browser css3
 2012-10-09 06:10:10 -07:00
Calen Pennington
97fb8be6ba Merge pull request #832 from MITx/feature/cdodge/subsection-edit-page 
Feature/cdodge/subsection edit page
 2012-10-09 06:08:15 -07:00
Александр
758e76dc14 added js to input for cr 2012-10-09 15:08:43 +03:00
Chris Dodge
ef1fb321b8 allow for adding/deleting of new 'policy' metadata in the edit subsection page 2012-10-08 16:46:25 -04: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
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
Chris Dodge
530f6a65c1 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-08 11:38:29 -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
Chris Dodge
0cf6a1179a wip - trigger display message when release data is different than parent release date 2012-10-08 10:43:46 -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