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

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
aee1e5e9a9 Updates to the list view and error container 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
Diana Huang
ffa42b6f11 Styles for the new instructor grading interface 2012-12-07 17:01:27 -05:00
Diana Huang
fcc1ab71f6 Update the formatting and layout of the Instructor Grading interface. 2012-12-07 17:01:27 -05:00
Diana Huang
b5f3386d27 Add breadcrumbing and clarify some of the text on the 
instructor grading interface.
 2012-12-07 17:01:27 -05:00
Diana Huang
5914b1cf91 Make the mock backend support different problems, and make sure 
the location is passed around properly. Clarify some of the numbers for
the user
 2012-12-07 17:01:26 -05:00
Diana Huang
94e1a9ffd3 Clean up some minor issues with list view 
and display some new information on the problem-specific page
 2012-12-07 17:01:26 -05:00
Diana Huang
48b9043213 Initial problem list functionality 2012-12-07 17:01:26 -05:00
David Ormsbee
e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. 2012-12-07 16:03:05 -05:00
Don Mitchell
457b4aa645 Merge pull request #1108 from MITx/feature/cdodge/course-info 
Feature/cdodge/course info
 2012-12-07 12:51:09 -08:00
Kevin Chugh
368b59a9e6 updated tooltips 2012-12-07 15:39:53 -05:00
Tom Giannattasio
299b28007b clean up of users page 2012-12-07 15:37:22 -05:00
Chris Dodge
402e031ecc forgot to add a if {} guard on the CodeMirror instantiation on one use case 2012-12-07 15:27:00 -05:00
Chris Dodge
b81f802b1d get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror 2012-12-07 14:38:03 -05:00
Tom Giannattasio
c8b4e8852f added modal cover for editors 2012-12-07 14:31:48 -05:00
Calen Pennington
b4793b3277 Add an implementation of get_items to xml module store 2012-12-07 12:02:29 -05:00
Carlos Andrés Rocha
cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ 
[#40805397]
 2012-12-07 11:59:13 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08:00
Calen Pennington
47ed02c9ea Remove more merge badness 2012-12-07 11:30:21 -05:00
Calen Pennington
3e568667fc Fix merge badness 2012-12-07 11:24:25 -05:00
Calen Pennington
3b75bbdc6f Actually run cms tests on cms master 2012-12-07 11:18:38 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
David Ormsbee
98fefd14c5 Merge pull request #1105 from MITx/feature/cale/github-status-api 
Feature/cale/github status api
 2012-12-07 08:09:00 -08:00
Calen Pennington
38671fc83c Move files from base.sh to test.sh 2012-12-07 11:01:58 -05:00
Calen Pennington
e2ed7d1c4e Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master 2012-12-07 10:56:24 -05:00
Calen Pennington
5a3cdc11cd Only mark github commit status when full test suite passes 2012-12-07 10:41:24 -05:00
Calen Pennington
d4ec5946d4 Mark failed state correctly 2012-12-07 10:37:44 -05:00
Victor Shnayder
44a8f31d06 Change are-we-logged-in detection to be less hackish. 
- has matching changes in controller staff_grading view.
 2012-12-07 10:35:45 -05:00
Victor Shnayder
730cdd3b4f minor changes from pull request comments 
- comments
- more info in log msg
- better error
 2012-12-07 10:35:44 -05:00
Victor Shnayder
53580af952 fix aws setting name 2012-12-07 10:35:44 -05:00
Victor Shnayder
bd94474a50 improve docstring 2012-12-07 10:35:44 -05:00
Victor Shnayder
7190e484f1 Use a namedtuple for parsing ScoreMessages 2012-12-07 10:35:44 -05:00
Victor Shnayder
bf593c6603 clean up imports 2012-12-07 10:35:44 -05:00
Victor Shnayder
42f8afb083 address minor code review comments 2012-12-07 10:35:44 -05:00
Victor Shnayder
3da727125f fix feedback formatting 2012-12-07 10:35:43 -05:00
Calen Pennington
3f5187401d Change message with state 2012-12-07 10:29:13 -05:00
Victor Shnayder
6d2688cb66 unicode fix and cleanup in stringify children 2012-12-07 10:21:46 -05:00
Calen Pennington
86579efc5b Source jenkins/base.sh with the correct path 2012-12-07 09:59:21 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Calen Pennington
724cba193a Source the base jenkins configuration before running tests 2012-12-07 09:43:52 -05:00
Calen Pennington
d4cdd5b485 Make jenkins talk to the github status api 2012-12-07 09:38:47 -05:00
Calen Pennington
1a89c14b62 Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs 
Fix/cdodge/lms runtime bugs
 2012-12-07 06:38:16 -08:00
Tom Giannattasio
75b413b5ac reworked add component steps 2012-12-07 09:35:34 -05:00
Vik Paruchuri
0bc0657939 Add in support for ordering tags properly in feedback box 2012-12-07 09:21:23 -05:00
Kevin Chugh
258b1fe9a5 thread responses create fixed 2012-12-06 22:12:17 -05:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule 
Fix/brian/nonascii html xmodule
 2012-12-06 15:33:21 -08:00
Brian Talbot
edbc12e1e3 homepage - added georgetown logo assets and resized other university logos to match 3x3 layout 2012-12-06 17:02:43 -05:00
Tom Giannattasio
22a61cdfb7 pulled out component types from behind add component button 2012-12-06 17:00:16 -05:00
marco
8a6a0673e6 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging 2012-12-06 16:43:19 -05:00
marco
00d1a7c73b added flag icons back in with proper transparency 2012-12-06 16:42:15 -05:00