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

7265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
320f1b4141 update schema for tracking sql logs - larger fields; add hostname 2012-12-21 08:44:40 -05:00
David Ormsbee
ecc4d79f55 Merge pull request #1193 from MITx/content/rocha/new-courses-2013 
Correct some spring courses announcement information
 2012-12-20 12:39:32 -08:00
Carlos Andrés Rocha
6ad6d348e6 Correct some spring courses announcement information 
[#41545421]
 2012-12-20 13:25:10 -05:00
David Ormsbee
89527281e8 Merge pull request #1186 from MITx/content/rocha/new-courses-2013 
Fix links for Software as a Service courses
 2012-12-19 13:16:27 -08:00
David Ormsbee
65ec8ae056 Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo 
edX's Zendesk Logo
 2012-12-19 13:15:26 -08:00
Carlos Andrés Rocha
b334394473 Fix links for Software as a Service courses 2012-12-19 16:13:17 -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
Brian Talbot
4bcfa84519 adding zendesk logo for styling purposes 2012-12-19 14:25:59 -05:00
David Ormsbee
a53959a770 Merge pull request #1181 from MITx/content/rocha/new-courses-2013 
Add news announcement for spring 2013 courses
 2012-12-19 09:36:10 -08:00
David Ormsbee
ed051a50a2 Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration 
Add google analytics to model signup and login panels
 2012-12-19 09:12:50 -08:00
David Ormsbee
4a283218ca Merge pull request #1179 from MITx/content/rocha/job-and-faq-update 
Update jobs and faq page
 2012-12-19 09:12:02 -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
Carlos Andrés Rocha
6d85accad8 Add news announcement for spring 2013 courses 
[# 41258693]
 2012-12-19 11:49:55 -05:00
Carlos Andrés Rocha
42857796c0 Update jobs and faq page 
[#41258701 #41258685]
 2012-12-19 11:39:44 -05:00
Don Mitchell
4a953d4949 Merge branch 'master' of github.com:MITx/mitx 2012-12-19 10:51:58 -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
0c4ced6361 Merge pull request #1176 from MITx/feature/dave/freeform_advertised_start 
Basic support for freeform advertised_start dates like 'Spring'
 2012-12-19 01:14:29 -08:00
David Ormsbee
8373ee4bf6 Basic support for freeform advertised_start dates like 'Spring' 2012-12-19 04:01:37 -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