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

7249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
8a0dae01f0 Add in some sorting and validation of the options list 2012-12-18 14:32:10 -05:00
Diana Huang
dfe438dc73 Initial work on the rubric input type including the most basic parsing 
without error handling
 2012-12-18 13:02:17 -05:00
David Ormsbee
1b8dfadc8e Merge pull request #1173 from MITx/feature/jarv/pin-mitx-versions 
pinning versions to what is currently on stage
 2012-12-18 08:01:51 -08:00
John Jarvis
c7a00cd2ba pinning versions to what is currently on stage 2012-12-17 19:07:23 -05:00
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
Calen Pennington
8b3c408d14 Merge pull request #1171 from MITx/fix/zoldak/common-coveragerc 
Exclude settings.py files from coverage reports and configure titles for...
 2012-12-17 12:09:29 -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
David Ormsbee
91c73fc034 Merge pull request #1170 from MITx/bugfix/dave/requests_version 
Our code breaks on requests >= 1.0, so locking in a version for dev
 2012-12-17 10:44:36 -08:00
David Ormsbee
eba4629f59 Our code breaks on requests >= 1.0, so locking in a version for dev 2012-12-17 13:35:33 -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
David Ormsbee
85f198e36a Merge pull request #1148 from MITx/fix/rocha/divide-create-dev-env-script 
Extract installation of system dependencies from create dev script
 2012-12-13 12:17:32 -08:00
Carlos Andrés Rocha
3025a88d73 Extract installation of system dependencies from create dev script 2012-12-13 15:11:53 -05:00
David Ormsbee
8fdf7f6cfd Merge pull request #1138 from MITx/bug/tom/pearson-ie7 
Bug/tom/pearson ie7
 2012-12-13 11:31:26 -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
Victor Shnayder
6e492aba7e Merge pull request #1128 from MITx/diana/instructor-skip-button 
Add skip button to instructor grading
 2012-12-11 15:12:55 -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
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
Diana Huang
85bffa6aaf Merge branch 'master' into diana/instructor-skip-button 2012-12-11 15:47:21 -05:00
Your Name
343dde6e29 fixed coffeescript to render mathjax correctly 2012-12-11 15:47:20 -05:00
Diana Huang
44d5a34180 Merge branch 'diana/instructor-skip-button' of github.com:MITx/mitx into diana/instructor-skip-button 2012-12-11 15:46:18 -05:00
Victor Shnayder
785974da67 Merge pull request #1126 from MITx/diana/open-ended-tests 
Merge in updates to tests for open ended grading
 2012-12-11 12:31:26 -08: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
43d76b9813 Add skip button logic to the LMS 2012-12-11 14:06:07 -05:00
Diana Huang
3b805fac1a Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing 
Fix for issues in open ended parsing
 2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c Fix for issues in open ended parsing 2012-12-11 13:14:34 -05:00
Diana Huang
370dfc77ea Merge branch 'master' into diana/open-ended-tests 2012-12-11 09:53:05 -05:00
Carlos Andrés Rocha
5cf9982c4a Merge pull request #1121 from MITx/feature/jarv/ipython 
Adding ipython to requirements
 2012-12-10 14:26:34 -08:00
John Jarvis
8aebb14eea Adding ipython to requirements 
We had this before as a python dependency but it was dropped
when we switched to virtual environments
 2012-12-10 17:15:31 -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
VikParuchuri
a651a7798e Merge pull request #1118 from MITx/bugfix/victor/open-ended-parsing 
Check for none.
 2012-12-10 11:27:39 -08:00
Vik Paruchuri
ab84042435 Fix raised error 2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2 Add a reload button to open-ended input problems 2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85 Check for none. 2012-12-10 14:10:19 -05: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