Commits · 48e0e222d91fa2137445504e0d2bd622218ae4f5 · edx / edx-platform · GitLab

18 Jul, 2012 40 commits
- Changing email messages to be edX, even the ones I don't think will be sent. · 48e0e222
  David Ormsbee committed Jul 18, 2012
  
  48e0e222 Browse Files
- Merge pull request #214 from MITx/mm-course-columns · 61fea82d
```
Display courses in university related columns.
```
  David Ormsbee committed Jul 18, 2012
  61fea82d Browse Files
- Display courses in university related columns. · a64ddc77
  Matthew Mongeau committed Jul 18, 2012
  
  a64ddc77 Browse Files
- Merge pull request #213 from MITx/dormsbee/simplewiki_migration · 48ff2c9c
```
Kill simplewiki migration (there was already a unique index, adding anot...
```
  David Ormsbee committed Jul 18, 2012
  48ff2c9c Browse Files
- Kill simplewiki migration (there was already a unique index, adding another causes errors) · 7273868e
  David Ormsbee committed Jul 18, 2012
  
  7273868e Browse Files
- temporary workaround due to root owned files · 34a6aa87
  John Jarvis committed Jul 18, 2012
  
  34a6aa87 Browse Files
- Merge pull request #211 from MITx/mm-course-registration-copy · 98a03514
```
Change copy for needed to sign up to register.
```
  David Ormsbee committed Jul 18, 2012
  98a03514 Browse Files
- Merge pull request #212 from MITx/mm-sign-up-links · da7a7d2d
```
Hook up tos and honor links.
```
  David Ormsbee committed Jul 18, 2012
  da7a7d2d Browse Files
- Merge pull request #209 from MITx/dormsbee/uni_profile · 9ec8c993
```
Dormsbee/uni profile
```
  David Ormsbee committed Jul 18, 2012
  9ec8c993 Browse Files
- Hook up tos and honor links. · a4afa689
  Matthew Mongeau committed Jul 18, 2012
  
  a4afa689 Browse Files
- Change copy for needed to sign up to register. · 78bee3a7
  Matthew Mongeau committed Jul 18, 2012
  
  78bee3a7 Browse Files
- Removed out of date comment. · c5d23b27
  bridger committed Jul 18, 2012
  
  c5d23b27 Browse Files
- Merge pull request #210 from MITx/release_fixes · a70e026e
```
Added the course image to the about page, even if the video doesn't exis...
```
  David Ormsbee committed Jul 18, 2012
  a70e026e Browse Files
- Added the course image to the about page, even if the video doesn't exist. · 80eb89a2
  Bridger Maxwell committed Jul 18, 2012
  
  80eb89a2 Browse Files
- Add University Profile page with images and text blurbs · 16eeb43a
  David Ormsbee committed Jul 18, 2012
  
  16eeb43a Browse Files
- Merge pull request #208 from MITx/release_fixes · bbcc19bf
```
Release fixes
```
  David Ormsbee committed Jul 18, 2012
  bbcc19bf Browse Files
- check_course didn't have the right exception being caught. · a9078ac0
  Bridger Maxwell committed Jul 18, 2012
  
  a9078ac0 Browse Files
- The dashboard links to the about page for courses that haven't started yet. · 75e9ef12
  Bridger Maxwell committed Jul 18, 2012
  
  75e9ef12 Browse Files
- Merge pull request #207 from MITx/mm-remove-preferred-language · a3d48cf2
```
Mm remove preferred language
```
  David Ormsbee committed Jul 18, 2012
  a3d48cf2 Browse Files
- Merge pull request #206 from MITx/custom_404 · 4ef84cb9
```
Custom 404
```
  David Ormsbee committed Jul 18, 2012
  4ef84cb9 Browse Files
- Added a method to render 404 and 500 pages. Added a reference to these views in urls.py. · 0fab4cdd
  Bridger Maxwell committed Jul 18, 2012
  
  0fab4cdd Browse Files
- Add course number to register links on Course About page · 7453af5a
  David Ormsbee committed Jul 18, 2012
  
  7453af5a Browse Files
- Merge pull request #205 from MITx/course_images · 75318164
```
Course images
```
  David Ormsbee committed Jul 18, 2012
  75318164 Browse Files
- Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 · 158bb699
  Bridger Maxwell committed Jul 18, 2012
  
  158bb699 Browse Files
- Removed application.css · 7d148d35
  Bridger Maxwell committed Jul 18, 2012
  
  7d148d35 Browse Files
- moving chown after pip install · 5ffafbe1
  John Jarvis committed Jul 18, 2012
  
  5ffafbe1 Browse Files
- Added {COURSE_STATIC_URL} format key for about section html. Changed… · f25dbc08
```
Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses.
```
  Bridger Maxwell committed Jul 18, 2012
  f25dbc08 Browse Files
- Fix message and notice styles. · 519a744f
  Matthew Mongeau committed Jul 18, 2012
  
  519a744f Browse Files
- wip · 73df3141
  Matthew Mongeau committed Jul 18, 2012
  
  73df3141 Browse Files
- Merge pull request #204 from MITx/dormsbee/at_a_glance · dbf0bf34
```
Add some more info the the "About" Course page "at a glance" section
```
  bridger committed Jul 18, 2012
  dbf0bf34 Browse Files
- Merge remote-tracking branch 'origin/dormsbee/at_a_glance' into release/1.0 · 14dc52f6
  Bridger Maxwell committed Jul 18, 2012
  
  14dc52f6 Browse Files
- Merge pull request #203 from MITx/multicourse-countries-and-other-demographics · 2f96527f
```
Multicourse countries and other demographics
```
  David Ormsbee committed Jul 18, 2012
  2f96527f Browse Files
- Add support for optional end_date, effort, and prerequisites info on course_about · 588f115b
  David Ormsbee committed Jul 18, 2012
  
  588f115b Browse Files
- adds styles to new inputs on signup form · 98ee9fb4
  Galen Frechette committed Jul 18, 2012
  
  98ee9fb4 Browse Files
- Add date_of_birth · dd0cd57e
  Matthew Mongeau committed Jul 18, 2012
  
  dd0cd57e Browse Files
- Cleanup. · 456054a2
  Matthew Mongeau committed Jul 18, 2012
  
  456054a2 Browse Files
- Added countries and other demographics to be stored in db. · 67221b07
  Matthew Mongeau committed Jul 18, 2012
  
  67221b07 Browse Files
- Change stored gender value for students.models.UserProfile · 7e25f39f
```
* Changed from 'male', 'female', and 'other' to 'm', 'f', and 'o'
```
  Matthew Mongeau committed Jul 18, 2012
  7e25f39f Browse Files
- Merge pull request #201 from MITx/mm-registered · 23460730
```
Display registered when already registered for a course.
```
  David Ormsbee committed Jul 18, 2012
  23460730 Browse Files
- Move logic into view.py for whether user is enrolled. · 44e8d747
  Matthew Mongeau committed Jul 18, 2012
  
  44e8d747 Browse Files