Commits · 78bee3a71e57a057727f9941123698cff41e7be4 · edx / edx-platform · GitLab

18 Jul, 2012 40 commits
- Change copy for needed to sign up to register. · 78bee3a7
  Matthew Mongeau committed Jul 18, 2012
  
  78bee3a7 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
- 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
- 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
- Display registered when already registered for a course. · 5824b2eb
  Matthew Mongeau committed Jul 18, 2012
  
  5824b2eb Browse Files
- The about image is now pulled from the course data directory and shown on the… · f007a8ff
```
The about image is now pulled from the course data directory and shown on the homepage, about course, and dashboard. Working on a way to show other, arbitrary course images.
```
  Bridger Maxwell committed Jul 18, 2012
  f007a8ff Browse Files
- Merge pull request #202 from MITx/mm-force-json-encoding · cae5c99e
```
Force dataType to 'text json'
```
  David Ormsbee committed Jul 18, 2012
  cae5c99e Browse Files
- Force dataType to 'text json' · 7d3c7782
  Matthew Mongeau committed Jul 18, 2012
  
  7d3c7782 Browse Files
- Merge pull request #200 from MITx/dormsbee/unknown_courses · 0c5395a5
```
Ignore registrations for Courses that can't be found
```
  David Ormsbee committed Jul 18, 2012
  0c5395a5 Browse Files
- adds styles to reset password page · 72f772d6
  Galen Frechette committed Jul 18, 2012
  
  72f772d6 Browse Files
- Ignore registrations for Courses that can't be found · 7acfdcd1
  David Ormsbee committed Jul 18, 2012
  
  7acfdcd1 Browse Files
- Remove Contact link from top nav (got moved into the About section) · 1979f3a3
  David Ormsbee committed Jul 18, 2012
  
  1979f3a3 Browse Files
- Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 · 0b097f47
  Bridger Maxwell committed Jul 18, 2012
  
  0b097f47 Browse Files
- Changed wording in emails to remove any 6.002x or MITx reference. · c24c8802
  Bridger Maxwell committed Jul 18, 2012
  
  c24c8802 Browse Files
- Merge pull request #199 from MITx/dormsbee/course_images · 824ea6f7
```
Dormsbee/course images
```
  David Ormsbee committed Jul 18, 2012
  824ea6f7 Browse Files
- Fix _modal.scss merge conflicts. · 63fd5b57
  Matthew Mongeau committed Jul 18, 2012
  
  63fd5b57 Browse Files
- Style notice. · 9bf4b11a
  Matthew Mongeau committed Jul 18, 2012
  
  9bf4b11a Browse Files