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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Calen Pennington
0ef56bb06c Merge pull request #830 from MITx/feature/tomg/cms-style-cleanup 
Random style updates
 2012-10-05 11:06:06 -07: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
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -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