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

2924 Commits

Author SHA1 Message Date
David Ormsbee
0ddea6d0ae Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx 
Feature/alex/video timeframe mitx
 2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -05:00
Carlos Andrés Rocha
a725bae313 Merge pull request #1155 from MITx/style/btalbot/university-logos-gtown 
Revised Georgetown University seal/logo for edx.org use
 2012-12-14 07:04:38 -08:00
Brian Talbot
4602a9d654 universities - revised Georgetown University seal/logo for homepage/university page use 2012-12-14 09:52:00 -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
Carlos Andrés Rocha
909ab2b5f6 Merge pull request #1146 from MITx/content/rocha/job-page-update 
Add member services job descriptions

[Finished #40869383]
 2012-12-13 14:42:38 -08:00
David Ormsbee
97ab513a10 Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage 
Ignore discussion modules with missing keys when building the global dis...
 2012-12-13 12:20:57 -08:00
Carlos Andrés Rocha
ede96d777d Add member services job descriptions 
[#40869383]
 2012-12-13 14:27:04 -05:00
Tom Giannattasio
bf9f9c1c48 added boxsizing polyfill 2012-12-12 17:03:12 -05:00
Tom Giannattasio
d1520792b8 removed extra width 2012-12-12 17:00:54 -05:00
Tom Giannattasio
b4321931a0 pearson ie7 bugs fixed (ish) 2012-12-12 16:59:38 -05:00
Calen Pennington
96daea5c0a Ignore discussion modules with missing keys when building the global discussion info 2012-12-12 09:40:31 -05: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
Diana Huang
4e81d9b2c5 Add some helpful indents and move the submission box to make 
grading easier to read
 2012-12-11 16:10:26 -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
41167a49a1 Merge branch 'master' into bugfix/kevin/mathjax-rendering 2012-12-11 15:47:43 -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
33f2d55a37 new test for problem lists 2012-12-11 14:40:30 -05:00
Diana Huang
4a2dabd30a new test for problem lists 2012-12-10 16:31:43 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling 
Updates to the instructor grading pages
 2012-12-10 10:39:19 -08:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Victor Shnayder
85b5190c29 fix login hack. Uses new return-error-msg-if-not-logged-in behavior 2012-12-10 10:41:40 -05:00
Diana Huang
c9d399d3bd Update instructor grading message with more accurate information 2012-12-10 09:35:30 -05:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities 
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
 2012-12-10 03:32:41 -08:00
Diana Huang
76f76a4ff8 Update tests and mock objects to work with the new API 2012-12-07 17:30:03 -05:00
Diana Huang
4ccf7c351d Fix service errors so that individual problems can now be displayed 
and graded
 2012-12-07 17:01:27 -05:00
Diana Huang
7f9fcfffdf Add support for the new staff grading views on the backend 2012-12-07 17:01:27 -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
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
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
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
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