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
Calen Pennington
14c1a18687 Re-raise an integrity error during user creation if it's not caused by something we know to check for 2012-05-08 14:13:27 -04:00
David Ormsbee
e02081b043 tiny bump in querystring call to CSS to make sure clients see updates 2012-05-08 14:13:27 -04:00
Calen Pennington
36b4b7bdb9 Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) 2012-05-08 14:13:27 -04:00
Calen Pennington
e725f59539 Add a settings file for doing grabs for main_static 2012-05-08 14:13:27 -04:00
Bridger Maxwell
aae0820238 Removed python code in templates to be javascript. 2012-05-08 14:13:27 -04:00
Bridger Maxwell
7f069ac2ce Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph. 2012-05-08 14:13:27 -04:00
Bridger Maxwell
752a625237 Added histogram graph for courseware administrators. 2012-05-08 14:13:27 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Calen Pennington
1e7363458e Anonymize date stamps in problem solutions 2012-05-08 10:19:23 -04:00
Lyla Fischer
4c0cc81d82 added tests 2012-05-07 23:05:31 -04:00
Lyla Fischer
ca89ce73ab fixed mysterious problem rendering issue 2012-05-07 22:19:03 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Piotr Mitros
f187a9e312 Capa no longer requires local filestore 2012-05-07 21:24:40 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Piotr Mitros
aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. 2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30 Moved extra settings into state. Added fs module for aux content 2012-05-07 20:13:30 -04:00
Prem Sichanugrist
a0ecbca080 Make the accordian expand 'Week 1' by default 
This fixes the regression from javascript rewrite.
 2012-05-07 18:28:52 -04:00
Prem Sichanugrist
48e2116c25 Fix the wrong package name in requirements file 
`PyFilesystem` has the package name of `fs`
 2012-05-07 18:16:11 -04:00
Prem Sichanugrist
83edb536bd Merge pull request #22 from MITx/rewrite-javascript 
Rewrite javascript on the main.html
 2012-05-07 15:07:55 -07:00
Prem Sichanugrist
a39c2c194d Rewrite Courseware navigation 2012-05-07 18:01:21 -04:00
Prem Sichanugrist
0ab9916017 Rewrite JavaScript on main page 
Both feedback form and calculator interaction now in its own class.
 2012-05-07 18:01:21 -04:00
Prem Sichanugrist
2c37950472 Add Jasmine to do a JavaScript unit test 2012-05-07 18:01:21 -04:00
Piotr Mitros
4ecb420fa7 Merge branch 'master' of github.com:MITx/mitx 2012-05-07 16:56:04 -04:00
Piotr Mitros
0e9511a4fc Added pyfilesystem to requirements.txt; needed for further hacking; want in common root 2012-05-07 16:55:39 -04:00
Kyle Fiedler
a172838715 Fixed some of the minor css bugs 2012-05-07 16:11:26 -04:00
Calen Pennington
1bd608e598 Make showanswer and rerandomize propogate downwards in course.xml 2012-05-07 15:36:13 -04:00
Calen Pennington
261ff83811 Add a guest_handouts.html for anonymous users 2012-05-07 15:36:02 -04:00
Kyle Fiedler
d8ace6c318 added styles for tutorial headers and removing extra padding on bottom sequence nav 2012-05-07 15:26:36 -04:00
Calen Pennington
83ea75b7d8 Rename simplewiki settings file 2012-05-07 15:01:43 -04:00
Calen Pennington
49f402e3e7 Remove debug print statements 2012-05-07 14:56:27 -04:00
Calen Pennington
47c832647c Call user_groups even for anonymous users 2012-05-07 14:56:17 -04:00
David Ormsbee
6ebb521d62 Merge pull request #32 from MITx/pmitros/video-annotations 
Videos now support annotations w/o verticals
 2012-05-07 08:09:32 -07:00
Piotr Mitros
ddcf68362a Videos now support annotations w/o verticals 2012-05-07 10:42:48 -04:00
pmitros
3cddaa4619 Merge pull request #19 from MITx/pmitros/histogram 
Draws histogram for scores
 2012-05-07 06:59:04 -07:00
pmitros
236b52cb04 Merge pull request #30 from MITx/cp-remove-csrf-domain 
Remove the csrf domain from the default settings because we don't need i...
 2012-05-07 06:57:47 -07:00
David Ormsbee
f36235c2ee Merge pull request #31 from MITx/pmitros-masquerade 
Masquerading works
 2012-05-04 13:41:14 -07:00
Piotr Mitros
6b6ef01cf0 Masquerading works 2012-05-04 16:29:44 -04:00
Calen Pennington
fefcd8570f Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url 2012-05-04 14:52:24 -04:00
Calen Pennington
2b7b9ada60 Make local file uploads work in dev environment 2012-05-04 14:44:50 -04:00
pmitros
7a9d142a76 Merge pull request #27 from MITx/user_integrity_error 
Remove some race conditions in user signups
 2012-05-04 11:43:05 -07:00
Calen Pennington
2a073a236a Re-raise an integrity error during user creation if it's not caused by something we know to check for 2012-05-04 14:41:56 -04:00
pmitros
c2f5f1d4a2 Merge pull request #28 from MITx/static_grab_settings 
Add a settings file for doing grabs for main_static. We may want to add COURSEWARE_ENABLED=False
 2012-05-04 08:20:46 -07:00
David Ormsbee
33b0446510 tiny bump in querystring call to CSS to make sure clients see updates 2012-05-04 10:56:19 -04:00
Kyle Fiedler
7c74d798ad Styles for new layout to the amplifier 2012-05-03 16:14:47 -04:00
Calen Pennington
90b7737b0d Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) 2012-05-03 15:16:05 -04:00
Calen Pennington
c981620fc2 Add a settings file for doing grabs for main_static 2012-05-03 15:14:02 -04:00
Kyle Fiedler
24b6636a62 Fix issue with calculator zindex 2012-05-02 13:51:37 -04:00
Kyle Fiedler
4cc3e30d94 Redesign sequence bottom arrows 2012-05-02 13:46:48 -04:00
Reda Lemeden
2992fb3dab Added edX logo to announecment 2012-05-01 19:08:48 -04:00
Calen Pennington
4c1fee2bfa Merge pull request #26 from MITx/rl-announcement 
Rl announcement
 2012-05-01 13:40:57 -07:00