Commits · b98743eb8d3ed68379ee74530e8e1b6e430960e2 · edx / edx-platform · GitLab

20 Dec, 2012 1 commit
- Merge branch 'master' into feature/diana/rubric-input · b98743eb
  Diana Huang committed Dec 20, 2012
  
  b98743eb Browse Files
19 Dec, 2012 19 commits
- Merge pull request #1186 from MITx/content/rocha/new-courses-2013 · 89527281
```
Fix links for Software as a Service courses
```
  David Ormsbee committed Dec 19, 2012
  89527281 Browse Files
- Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo · 65ec8ae0
```
edX's Zendesk Logo
```
  David Ormsbee committed Dec 19, 2012
  65ec8ae0 Browse Files
- Fix links for Software as a Service courses · b3343944
  Carlos Andrés Rocha committed Dec 19, 2012
  
  b3343944 Browse Files
- Fix the font size · fa97a6a5
  Diana Huang committed Dec 19, 2012
  
  fa97a6a5 Browse Files
- Merge pull request #1183 from MITx/bug/dhm/ie7 · 6905f7df
```
Bug/dhm/ie7
```
  Calen Pennington committed Dec 19, 2012
  6905f7df Browse Files
- adding zendesk logo for styling purposes · 4bcfa845
  Brian Talbot committed Dec 19, 2012
  
  4bcfa845 Browse Files
- Merge branch 'master' into feature/diana/rubric-input · ce9229fa
  Diana Huang committed Dec 19, 2012
  
  ce9229fa Browse Files
- Move rubric into a subset of problem in CSS. · 72810305
  Diana Huang committed Dec 19, 2012
  
  72810305 Browse Files
- Merge pull request #1181 from MITx/content/rocha/new-courses-2013 · a53959a7
```
Add news announcement for spring 2013 courses
```
  David Ormsbee committed Dec 19, 2012
  a53959a7 Browse Files
- Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration · ed051a50
```
Add google analytics to model signup and login panels
```
  David Ormsbee committed Dec 19, 2012
  ed051a50 Browse Files
- Merge pull request #1179 from MITx/content/rocha/job-and-faq-update · 4a283218
```
Update jobs and faq page
```
  David Ormsbee committed Dec 19, 2012
  4a283218 Browse Files
- Add google analytics to model signup and login panels · a239fe2e
```
[# 40805407]
```
  Carlos Andrés Rocha committed Dec 19, 2012
  a239fe2e Browse Files
- Add in CSS updates and fixes to the template so that it will work. · 11d5eea2
  Diana Huang committed Dec 19, 2012
  
  11d5eea2 Browse Files
- Add news announcement for spring 2013 courses · 6d85acca
```
[# 41258693]
```
  Carlos Andrés Rocha committed Dec 19, 2012
  6d85acca Browse Files
- Update jobs and faq page · 42857796
```
[#41258701 #41258685]
```
  Carlos Andrés Rocha committed Dec 19, 2012
  42857796 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · 4a953d49
  Don Mitchell committed Dec 19, 2012
  
  4a953d49 Browse Files
- ie7 fixes: define indexOf, use charAt rather than [] to access string, · 326d21d1
```
put try/catch around fn that was throwing errors.
```
  Don Mitchell committed Dec 19, 2012
  326d21d1 Browse Files
- Merge pull request #1176 from MITx/feature/dave/freeform_advertised_start · 0c4ced63
```
Basic support for freeform advertised_start dates like 'Spring'
```
  David Ormsbee committed Dec 19, 2012
  0c4ced63 Browse Files
- Basic support for freeform advertised_start dates like 'Spring' · 8373ee4b
  David Ormsbee committed Dec 19, 2012
  
  8373ee4b Browse Files
18 Dec, 2012 4 commits
- Add in some sorting and validation of the options list · 8a0dae01
  Diana Huang committed Dec 18, 2012
  
  8a0dae01 Browse Files
- Initial work on the rubric input type including the most basic parsing · dfe438dc
```
without error handling
```
  Diana Huang committed Dec 18, 2012
  dfe438dc Browse Files
- Merge pull request #1173 from MITx/feature/jarv/pin-mitx-versions · 1b8dfadc
```
pinning versions to what is currently on stage
```
  David Ormsbee committed Dec 18, 2012
  1b8dfadc Browse Files
- pinning versions to what is currently on stage · c7a00cd2
  John Jarvis committed Dec 17, 2012
  
  c7a00cd2 Browse Files
17 Dec, 2012 5 commits
- Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx · 0ddea6d0
```
Feature/alex/video timeframe mitx
```
  David Ormsbee committed Dec 17, 2012
  0ddea6d0 Browse Files
- Merge pull request #1171 from MITx/fix/zoldak/common-coveragerc · 8b3c408d
```
Exclude settings.py files from coverage reports and configure titles for...
```
  Calen Pennington committed Dec 17, 2012
  8b3c408d Browse Files
- Exclude settings.py files from coverage reports and configure titles for the reports. · cc54c373
  Jay Zoldak committed Dec 17, 2012
  
  cc54c373 Browse Files
- Merge pull request #1170 from MITx/bugfix/dave/requests_version · 91c73fc0
```
Our code breaks on requests >= 1.0, so locking in a version for dev
```
  David Ormsbee committed Dec 17, 2012
  91c73fc0 Browse Files
- Our code breaks on requests >= 1.0, so locking in a version for dev · eba4629f
  David Ormsbee committed Dec 17, 2012
  
  eba4629f Browse Files
14 Dec, 2012 3 commits
- Merge pull request #1155 from MITx/style/btalbot/university-logos-gtown · a725bae3
```
Revised Georgetown University seal/logo for edx.org use
```
  Carlos Andrés Rocha committed Dec 14, 2012
  a725bae3 Browse Files
- universities - revised Georgetown University seal/logo for homepage/university page use · 4602a9d6
  Brian Talbot committed Dec 14, 2012
  
  4602a9d6 Browse Files
- Merge pull request #1127 from MITx/bugfix/kevin/mathjax-rendering · 7dd2f48e
```
Bugfix/kevin/mathjax rendering
```
  David Ormsbee committed Dec 14, 2012
  7dd2f48e Browse Files
13 Dec, 2012 6 commits
- Merge pull request #1146 from MITx/content/rocha/job-page-update · 909ab2b5
```
Add member services job descriptions

[Finished #40869383]
```
  Carlos Andrés Rocha committed Dec 13, 2012
  909ab2b5 Browse Files
- Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage · 97ab513a
```
Ignore discussion modules with missing keys when building the global dis...
```
  David Ormsbee committed Dec 13, 2012
  97ab513a Browse Files
- Merge pull request #1148 from MITx/fix/rocha/divide-create-dev-env-script · 85f198e3
```
Extract installation of system dependencies from create dev script
```
  David Ormsbee committed Dec 13, 2012
  85f198e3 Browse Files
- Extract installation of system dependencies from create dev script · 3025a88d
  Carlos Andrés Rocha committed Dec 13, 2012
  
  3025a88d Browse Files
- Merge pull request #1138 from MITx/bug/tom/pearson-ie7 · 8fdf7f6c
```
Bug/tom/pearson ie7
```
  David Ormsbee committed Dec 13, 2012
  8fdf7f6c Browse Files
- Add member services job descriptions · ede96d77
```
[#40869383]
```
  Carlos Andrés Rocha committed Dec 13, 2012
  ede96d77 Browse Files
12 Dec, 2012 2 commits
- added boxsizing polyfill · bf9f9c1c
  Tom Giannattasio committed Dec 12, 2012
  
  bf9f9c1c Browse Files
- removed extra width · d1520792
  Tom Giannattasio committed Dec 12, 2012
  
  d1520792 Browse Files