Commits · 72f772d6ff10a99035fab40f5104b4ad73da6699 · edx / edx-platform · GitLab

18 Jul, 2012 13 commits
- adds styles to reset password page · 72f772d6
  Galen Frechette committed Jul 18, 2012
  
  72f772d6 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 27 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
- Added a check that course enrolmments don't already exist before creating them. · 996fec4b
  Bridger Maxwell committed Jul 17, 2012
  
  996fec4b Browse Files
- Merge remote-tracking branch 'origin/master' into release/1.0 · 9f84d9b6
  Bridger Maxwell committed Jul 17, 2012
  
  9f84d9b6 Browse Files
- Added a migration with indexes on course enrollment and a unique constraint.… · 1a8d9996
```
Added a migration with indexes on course enrollment and a unique constraint. This involves a migration that first drops the table, because there may be non-unique data there already.
```
  Bridger Maxwell committed Jul 17, 2012
  1a8d9996 Browse Files
- Merge pull request #192 from MITx/mm-login-errors-display · 9f17e0b1
```
Login errors should display on first failure.
```
  David Ormsbee committed Jul 17, 2012
  9f17e0b1 Browse Files
- Login errors should display on first failure. · ba959152
  Matthew Mongeau committed Jul 17, 2012
  
  ba959152 Browse Files
- updates copy on about contact and faq, tweeks home page header · c5ce0bdf
  Galen Frechette committed Jul 17, 2012
  
  c5ce0bdf Browse Files
- Use local feed as default · 171e16f1
  Matthew Mongeau committed Jul 17, 2012
  
  171e16f1 Browse Files
- updates and imporves design of the home page header · d55cd78c
  Galen Frechette committed Jul 17, 2012
  
  d55cd78c Browse Files
- Add parsed rss entries to home page with caching · 2bfe0cb9
  Matthew Mongeau committed Jul 17, 2012
  
  2bfe0cb9 Browse Files
- Merge pull request #179 from MITx/course_start · 04b8dbe0
```
Course start
```
  bridger committed Jul 17, 2012
  04b8dbe0 Browse Files