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

6458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
David Ormsbee
0ed735b7b6 Merge pull request #808 from MITx/bugfix/victor/fix-anon-user-access-check 
fix a bug: can_load() should check for the 'load' permission.
 2012-10-02 16:27:00 -07:00
Victor Shnayder
227cc58d30 fix a bug: can_load() should check for the 'load' permission. 
- triggered by anon users when all courses have started (or start dates are off).
 2012-10-02 18:59:04 -04:00
David Ormsbee
13c8cbf5af Merge pull request #807 from MITx/feature/victor/status-banner 
Feature/victor/status banner
 2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -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
Tom Giannattasio
671f2af387 added image 2012-10-02 13:39:42 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Victor Shnayder
21d5abd824 Merge pull request #801 from MITx/feature/cale/allow-static-python-files 
Don't ignore .py files in static files dirs
 2012-10-02 09:20:26 -07: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
258a210556 Don't ignore .py files in static files dirs 2012-10-02 11:04:43 -04:00
Calen Pennington
fbba883c26 Merge pull request #794 from MITx/feature/cdodge/cms-permissions-management 
Feature/cdodge/cms permissions management
 2012-10-02 06:56:13 -07:00
Chris Dodge
f17b48fff3 fix problem introduced when rebasing master and manually resolving conflicts 2012-10-01 15:19:05 -04:00
Chris Dodge
116c7ed31d fix typo bug on PermissionDenied exception raising 2012-10-01 15:14:16 -04:00