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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lyla Fischer
7f92606ec9 responses to code review 2012-05-10 10:38:06 -04:00
Calen Pennington
41aaadf019 Add back in the exclusions for build artifacts 2012-05-10 10:18:05 -04:00
Calen Pennington
5011f60d45 Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
 2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3 Merge pull request #18 from MITx/grade-refactor 
Grade refactor
 2012-05-09 15:00:25 -07:00
David Ormsbee
03d3508bd5 Merge pull request #38 from MITx/pmitros/xmod-reuse-refactor 
Pmitros/xmod reuse refactor
 2012-05-09 14:53:16 -07:00
Piotr Mitros
0bff9a80d2 Merge 2012-05-09 17:52:39 -04:00
Piotr Mitros
f511a5e0dd Changed parameters from **args based on code review 2012-05-09 17:37:54 -04:00
Reda Lemeden
3847dee605 Added official badge styling to staff questions 2012-05-09 15:30:12 -04:00
Calen Pennington
077d4a7d6d Removing unneeded imports 2012-05-09 14:44:49 -04:00
David Ormsbee
8bd00b34ed Merge pull request #37 from MITx/faq_addition 
added questions to faq
 2012-05-09 09:46:55 -07:00
Lyla Fischer
8ad1d3e17d added questions to faq 2012-05-09 12:31:55 -04:00
Kyle Fiedler
38098df985 Merge branch 'kf-amplifier' 2012-05-08 15:01:03 -04:00
Kyle Fiedler
29dd45e517 Fix styles for play button 2012-05-08 14:43:49 -04:00
Kyle Fiedler
e0a313e36b added more layout to amplifier 2012-05-08 14:13:30 -04:00
Kyle Fiedler
b50478331e Added image for the slider handle 2012-05-08 14:13:29 -04:00
Calen Pennington
8841479624 Anonymize date stamps in problem solutions 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
ecf0126fce Make the accordian expand 'Week 1' by default 
This fixes the regression from javascript rewrite.
 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
dfee512ba8 Fix the wrong package name in requirements file 
`PyFilesystem` has the package name of `fs`
 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
07629ef45d Rewrite Courseware navigation 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
80aeaed5fe Rewrite JavaScript on main page 
Both feedback form and calculator interaction now in its own class.
 2012-05-08 14:13:29 -04:00
Prem Sichanugrist
43a6534e75 Add Jasmine to do a JavaScript unit test 2012-05-08 14:13:29 -04:00
Piotr Mitros
d22566a310 Added pyfilesystem to requirements.txt; needed for further hacking; want in common root 2012-05-08 14:13:29 -04:00
Kyle Fiedler
171d40270f Fixed some of the minor css bugs 2012-05-08 14:13:29 -04:00
Calen Pennington
4084aaef18 Make showanswer and rerandomize propogate downwards in course.xml 2012-05-08 14:13:28 -04:00
Kyle Fiedler
edec1b5558 added styles for tutorial headers and removing extra padding on bottom sequence nav 2012-05-08 14:13:28 -04:00
Piotr Mitros
f9adfdbb50 Videos now support annotations w/o verticals 2012-05-08 14:13:28 -04:00
Piotr Mitros
4e915d5268 Masquerading works 2012-05-08 14:13:28 -04:00
Calen Pennington
9d6878226f 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-08 14:13:28 -04:00
Calen Pennington
9ac2c559a9 Make local file uploads work in dev environment 2012-05-08 14:13:28 -04:00
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