Commits · 456054a2617618a78b28a482464691ce396c4366 · edx / edx-platform · GitLab

18 Jul, 2012 23 commits
- 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
- 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
- Show sign up form if not signed in. · c5d3efdf
  Matthew Mongeau committed Jul 18, 2012
  
  c5d3efdf Browse Files
- Video slot only appears in course about page if there is a video (note: url is still fixed). · 8768189d
  David Ormsbee committed Jul 18, 2012
  
  8768189d Browse Files
- Add course start dates to course boxes in courses list view. · 6eccf99a
  David Ormsbee committed Jul 17, 2012
  
  6eccf99a Browse Files
- adds styles to password reset modal · ba8eb93b
  Galen Frechette committed Jul 17, 2012
  
  ba8eb93b Browse Files
- Display real course start date in course about page · a12e628f
  David Ormsbee committed Jul 17, 2012
  
  a12e628f Browse Files
- updates UC Berkeley logo · 7af062ea
  Galen Frechette committed Jul 17, 2012
  
  7af062ea Browse Files
17 Jul, 2012 17 commits
- Merge pull request #196 from MITx/mm-signup-errors · da31f76d
```
Fix sign up styles.
```
  David Ormsbee committed Jul 17, 2012
  da31f76d Browse Files
- Fix sign up styles. · c0fffa45
  Matthew Mongeau committed Jul 17, 2012
  
  c0fffa45 Browse Files
- changes about page layout to longform blog style layout to accomodate large amounts of copy · 14b6ad25
  Galen Frechette committed Jul 17, 2012
  
  14b6ad25 Browse Files
- Moved enroll and course_about to courseware, because they depend on lms. · e4a3b261
  Bridger Maxwell committed Jul 17, 2012
  
  e4a3b261 Browse Files
- Forgot to add changes to this scss file in last commit. · aaa31594
  Bridger Maxwell committed Jul 17, 2012
  
  aaa31594 Browse Files
- Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 · 224ce121
  Bridger Maxwell committed Jul 17, 2012
  
  224ce121 Browse Files
- Changed urls for the portal-icons to be relative, which makes them work. · b8317619
  Bridger Maxwell committed Jul 17, 2012
  
  b8317619 Browse Files
- Remove password_reset_form · f630446d
  Matthew Mongeau committed Jul 17, 2012
  
  f630446d Browse Files
- Hook up forms for forgot password functionality. · 9c672f7b
  Matthew Mongeau committed Jul 17, 2012
  
  9c672f7b Browse Files
- Fixed help link in nav bar. Removed account settings link. · 9def7ae6
  Bridger Maxwell committed Jul 17, 2012
  
  9def7ae6 Browse Files
- Merge remote-tracking branch 'origin/master' into release/1.0 · 6ed9f716
```
Conflicts:
	lms/templates/index.html
```
  Bridger Maxwell committed Jul 17, 2012
  6ed9f716 Browse Files
- Moved lms/static/images/portal-icons/ to lms/static/portal-icons/, because… · 30d0a9bd
```
Moved lms/static/images/portal-icons/ to lms/static/portal-icons/, because collecstatic wants it there. We should figure out why, but it was blocking the build.
```
  Bridger Maxwell committed Jul 17, 2012
  30d0a9bd Browse Files
- Dummy commit to force rebuild · 1498e40d
  David Ormsbee committed Jul 17, 2012
  
  1498e40d Browse Files
- adds one image to about page · ba6346cb
  Galen Frechette committed Jul 17, 2012
  
  ba6346cb Browse Files
- improves course about page header, adds blog post images, works on static page layouts · e6589545
  Galen Frechette committed Jul 17, 2012
  
  e6589545 Browse Files
- Merge pull request #193 from MITx/mm-rss-parser-fixes · 8bd0f018
```
Store rss instead of parser in memcache.
```
  David Ormsbee committed Jul 17, 2012
  8bd0f018 Browse Files
- Store rss instead of parser in memcache. · 384f2406
  Matthew Mongeau committed Jul 17, 2012
  
  384f2406 Browse Files