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

7181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Ormsbee
b069f95c07 Merge pull request #1109 from MITx/feature/dave/pearson_ie7 
IE7 compatibility
 2012-12-07 14:08:46 -08: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
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
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
Vik Paruchuri
0bc0657939 Add in support for ordering tags properly in feedback box 2012-12-07 09:21:23 -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
Brian Talbot
cc870f8ecd homepage - changed partner university listing layout to handle 6 partners 2012-12-06 14:37:09 -05:00
Vik Paruchuri
1eaf424c20 Change some things to use format 2012-12-05 13:17:16 -05:00
Vik Paruchuri
e813dc3514 Address format issue and exception 2012-12-05 12:08:26 -05:00
Victor Shnayder
3795b3a785 Address Dave's comments 
- factor out some common code
- improve variable names
 2012-12-05 10:56:12 -05:00
Victor Shnayder
3b3ee2bf52 Merge branch 'feature/victor/instructor-grading' of github.com:MITx/mitx into feature/victor/instructor-grading 2012-12-05 10:37:24 -05:00
Victor Shnayder
a498377ad5 Merge pull request #1102 from MITx/diana/instructor-grading-styling 
Diana/instructor grading styling
 2012-12-05 06:49:47 -08:00
Diana Huang
5ebde2a93e fix comment 2012-12-05 09:42:30 -05:00
Diana Huang
cb6bb38f84 merge commit 2012-12-05 09:40:53 -05:00
Victor Shnayder
7887f556d9 Add docs on using a queue server on aws from a local LMS 2012-12-05 09:29:42 -05:00
Diana Huang
90076c39e6 add in some new mock responses for our staff grading API 2012-12-05 09:25:05 -05:00
Victor Shnayder
40f34d19a3 add initial mock of get_problems call 2012-12-04 17:46:34 -05:00
Victor Shnayder
1d87dab3a7 remove queueing spinner and polling logic, change message 
- no polling, since instructors may take a long time to grade
 2012-12-04 17:45:51 -05:00
Victor Shnayder
1d9d347df9 Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap 
Don't cap points coming back from CodeResponses
 2012-12-04 13:59:06 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Victor Shnayder
c57b9f3240 merge prompt and ml accuracy display 2012-12-04 14:44:23 -05:00
Victor Shnayder
d4a3e4d044 fix logger name 2012-12-04 14:44:23 -05:00
Brian Wilson
70f35b2e15 remove skipped tests that use mongo 2012-12-04 13:46:32 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Carlos Andrés Rocha
94a12bddb6 Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent 
Modify Wellesley rollover logo
 2012-12-04 07:27:59 -08:00
Carlos Andrés Rocha
c702bbcd85 Modify Wellesley rollover logo 2012-12-04 10:27:23 -05:00
Carlos Andrés Rocha
4f9f17d3bb Merge pull request #1098 from MITx/content/rocha/wellesley-announcmenent 
Add Wellesley College news announcement and frontpage changes
 2012-12-04 07:01:47 -08:00
Carlos Andrés Rocha
4d6162b1df Fix incorrect Facebook URL for Wellesley news announcement 2012-12-04 09:58:50 -05:00