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

19226 Commits

Author SHA1 Message Date
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
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
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
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -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
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
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
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Chris Dodge
c3aa86f1fb remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir 2012-10-04 14:53:43 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04: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
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
Calen Pennington
35d1966d9a Merge pull request #813 from MITx/feature/cdodge/asset-id-change 
add a 'safety switch' where we add new content into GridFS with a filena...
 2012-10-03 11:29:16 -07:00
Calen Pennington
d80c931772 Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module) 2012-10-03 14:24:11 -04:00
Chris Dodge
ebf6d07607 add a 'safety switch' where we add new content into GridFS with a filename (which GridFS maintains an index on) in case any assumptions about our new id scheme proves to be false. We can query by filename (which is a /tag/org/course/category/name format) so it'll be unique 2012-10-03 12:36:35 -04:00
Calen Pennington
5e7699554e Merge pull request #803 from MITx/feature/tomg/cms-editing 
code mirror styling and a few small tweaks
 2012-10-03 07:20:52 -07:00
Tom Giannattasio
e1fbe1e049 added code mirror styles 2012-10-03 09:47:19 -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
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
Chris Dodge
fb204084a2 for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect 2012-10-03 09:24:48 -04:00
Chris Dodge
eb7d6c656c use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py. 2012-10-03 09:17:18 -04:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -04:00
Carlos Andrés Rocha
8ac13f5c60 Add styling for code grader responses 2012-10-02 22:56:56 -04:00
arjun810
f627c9e9c1 Merge pull request #791 from MITx/kimth/js-refactor 
Kimth/js refactor
 2012-10-02 19:47:20 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Victor Shnayder
8b0f1a0305 get rid of caching--unneeded complexity. 2012-10-02 15:03:06 -04:00
Carlos Andrés Rocha
f357e90dc0 Add support for video download link 
Add a download link to the video player. The link is defined in the
content xml using the following structure:

<video youtube="youtubestring">
  <source src="video_link"/>
</video>
 2012-10-02 14:23:31 -04:00
Chris Dodge
a60ec13d3a fix bug with editing HTML. The save() method should now return a dictionary, not a string 2012-10-02 11:58:24 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
kimth
845b921ca1 Missing comma 2012-10-02 15:42:22 +00:00
kimth
ed55e4ae2f Move collapsible back into xmodule 2012-10-02 15:41:38 +00:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
b305c0bae2 Make drag/drop save content immediately in seqs and verticals 2012-10-01 15:17:41 -04:00
Calen Pennington
fd7223bd87 Make editing work, building towards drag/drop saving 2012-10-01 15:17:41 -04:00
Calen Pennington
b91c2b6680 Add sequence and vertical js modules that add drag and drop 2012-10-01 15:17:41 -04:00