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

534 Commits

Author SHA1 Message Date
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
Diana Huang
d0e00af60e Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-10 16:45:40 -05:00
Diana Huang
81bb2dc979 Better and clearer comments along with some fixes 
for code review issues
 2013-01-10 16:45:19 -05:00
Diana Huang
13c692c29b Show back button when we see an error. 2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875 Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643 Use correct user id and make the reload button a back button 2013-01-09 14:41:23 -05:00
Diana Huang
950d398387 Updates to the CSS 2013-01-09 10:19:42 -05:00
Diana Huang
19401f29d9 Minor javascript updates 2013-01-08 10:22:07 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Diana Huang
e410703e33 Minor bug fixes and improvements 2013-01-04 17:20:03 -05:00
Diana Huang
093560e859 Updates to copy and styling and a few bugfixes 2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a Add interstitial page between calibration and grading. 
Make individual Prompt and Rubric Sections hideable.
 2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626 Improvements to calibration feedback step 2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
b5f34a9da6 Show special text when calibrating or when grading. 2013-01-04 11:03:24 -05:00
Diana Huang
fe86c25f72 Bug fixes for the JS and the peer grading service 2013-01-03 17:23:30 -05:00
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
Diana Huang
078b2a5b95 Fix up some minor state issues and 
complete basic JS functionality for page
 2013-01-03 16:19:04 -05:00
Diana Huang
becffd4dbb Updated html and javascript for new pages as well 
as a fix for the peer grading service
 2013-01-03 14:08:56 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
valera-rozuvan
233a35e01e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
37c7967e8c Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
213ca3fa32 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
fd0ec0ed8a Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
de63541049 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
d0c72ebe16 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8af93229d3 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7cf848db9e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c4f336d8fd Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8f120f1d27 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c94530cb01 Added initial RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
Diana Huang
c89ff2ac0e Basic peer grading view using mocks and some cleanup in 
the peer grading service
 2013-01-02 17:44:58 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages 
and the problem list page
 2013-01-02 15:01:59 -05:00
Calen Pennington
6905f7dfd1 Merge pull request #1183 from MITx/bug/dhm/ie7 
Bug/dhm/ie7
 2012-12-19 12:58:07 -08:00
Carlos Andrés Rocha
a239fe2ee7 Add google analytics to model signup and login panels 
[# 40805407]
 2012-12-19 12:07:34 -05:00
Don Mitchell
326d21d143 ie7 fixes: define indexOf, use charAt rather than [] to access string, 
put try/catch around fn that was throwing errors.
 2012-12-19 10:48:03 -05:00
David Ormsbee
7dd2f48efc Merge pull request #1127 from MITx/bugfix/kevin/mathjax-rendering 
Bugfix/kevin/mathjax rendering
 2012-12-14 05:07:24 -08:00
Diana Huang
59829a897c Add error message when encountering an error posting back 
without a proper error response object
 2012-12-11 18:09:25 -05:00
Your Name
6b59fd4de2 update 2 2012-12-11 15:54:46 -05:00
Your Name
df5a62305c update 2012-12-11 15:51:17 -05:00
Your Name
343dde6e29 fixed coffeescript to render mathjax correctly 2012-12-11 15:47:20 -05:00
Diana Huang
0e54592175 Add skip button logic to the LMS 2012-12-11 14:40:30 -05:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make 
the feedback box less important.
 2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
275c9ef7fd Update API with server and add new meta info box for meta information 2012-12-07 17:01:27 -05:00
Diana Huang
7c768cbbff Wire up the separate action button 2012-12-07 17:01:27 -05:00
Diana Huang
ef82ced2af Improve the paragraph maker on the staff grading page 2012-12-07 17:01:27 -05:00