Bridger Maxwell
|
f007a8ff92
|
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.
|
2012-07-18 11:44:19 -04:00 |
|
David Ormsbee
|
cae5c99e10
|
Merge pull request #202 from MITx/mm-force-json-encoding
Force dataType to 'text json'
|
2012-07-18 08:37:26 -07:00 |
|
Matthew Mongeau
|
7d3c778268
|
Force dataType to 'text json'
|
2012-07-18 11:36:20 -04:00 |
|
David Ormsbee
|
0c5395a5dc
|
Merge pull request #200 from MITx/dormsbee/unknown_courses
Ignore registrations for Courses that can't be found
|
2012-07-18 08:00:48 -07:00 |
|
Galen Frechette
|
72f772d6ff
|
adds styles to reset password page
|
2012-07-18 10:56:59 -04:00 |
|
David Ormsbee
|
7acfdcd16d
|
Ignore registrations for Courses that can't be found
|
2012-07-18 10:49:45 -04:00 |
|
David Ormsbee
|
1979f3a33b
|
Remove Contact link from top nav (got moved into the About section)
|
2012-07-18 10:38:58 -04:00 |
|
Bridger Maxwell
|
0b097f470d
|
Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0
|
2012-07-18 10:37:07 -04:00 |
|
Bridger Maxwell
|
c24c88022b
|
Changed wording in emails to remove any 6.002x or MITx reference.
|
2012-07-18 10:36:55 -04:00 |
|
David Ormsbee
|
824ea6f72e
|
Merge pull request #199 from MITx/dormsbee/course_images
Dormsbee/course images
|
2012-07-18 07:24:23 -07:00 |
|
Matthew Mongeau
|
63fd5b57dd
|
Fix _modal.scss merge conflicts.
|
2012-07-18 10:23:44 -04:00 |
|
Matthew Mongeau
|
9bf4b11ae9
|
Style notice.
|
2012-07-18 10:11:06 -04:00 |
|
Matthew Mongeau
|
c5d3efdf60
|
Show sign up form if not signed in.
|
2012-07-18 10:10:37 -04:00 |
|
David Ormsbee
|
8768189db1
|
Video slot only appears in course about page if there is a video (note: url is still fixed).
|
2012-07-18 01:29:00 -04:00 |
|
David Ormsbee
|
6eccf99aca
|
Add course start dates to course boxes in courses list view.
|
2012-07-17 23:50:18 -04:00 |
|
Galen Frechette
|
ba8eb93b43
|
adds styles to password reset modal
|
2012-07-17 22:53:03 -04:00 |
|
David Ormsbee
|
a12e628fb1
|
Display real course start date in course about page
|
2012-07-17 22:52:19 -04:00 |
|
Galen Frechette
|
7af062ea33
|
updates UC Berkeley logo
|
2012-07-17 22:15:28 -04:00 |
|
David Ormsbee
|
da31f76dfb
|
Merge pull request #196 from MITx/mm-signup-errors
Fix sign up styles.
|
2012-07-17 15:38:36 -07:00 |
|
Matthew Mongeau
|
c0fffa451b
|
Fix sign up styles.
|
2012-07-17 18:09:48 -04:00 |
|
Galen Frechette
|
14b6ad25a7
|
changes about page layout to longform blog style layout to accomodate large amounts of copy
|
2012-07-17 17:49:44 -04:00 |
|
Bridger Maxwell
|
e4a3b261d4
|
Moved enroll and course_about to courseware, because they depend on lms.
|
2012-07-17 17:09:20 -04:00 |
|
Bridger Maxwell
|
aaa31594b1
|
Forgot to add changes to this scss file in last commit.
|
2012-07-17 16:54:13 -04:00 |
|
Bridger Maxwell
|
224ce121e7
|
Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0
|
2012-07-17 16:38:57 -04:00 |
|
Bridger Maxwell
|
b8317619f2
|
Changed urls for the portal-icons to be relative, which makes them work.
|
2012-07-17 16:38:48 -04:00 |
|
Matthew Mongeau
|
f630446de3
|
Remove password_reset_form
|
2012-07-17 16:27:32 -04:00 |
|
Matthew Mongeau
|
9c672f7bd0
|
Hook up forms for forgot password functionality.
|
2012-07-17 16:27:30 -04:00 |
|
Bridger Maxwell
|
9def7ae6b0
|
Fixed help link in nav bar. Removed account settings link.
|
2012-07-17 15:32:22 -04:00 |
|
Bridger Maxwell
|
6ed9f71608
|
Merge remote-tracking branch 'origin/master' into release/1.0
Conflicts:
lms/templates/index.html
|
2012-07-17 15:24:25 -04:00 |
|
Bridger Maxwell
|
30d0a9bd7f
|
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.
|
2012-07-17 15:12:58 -04:00 |
|
David Ormsbee
|
1498e40d87
|
Dummy commit to force rebuild
|
2012-07-17 14:58:09 -04:00 |
|
Galen Frechette
|
ba6346cb22
|
adds one image to about page
|
2012-07-17 14:54:35 -04:00 |
|
Galen Frechette
|
e65895459a
|
improves course about page header, adds blog post images, works on static page layouts
|
2012-07-17 14:29:20 -04:00 |
|
David Ormsbee
|
8bd0f0183b
|
Merge pull request #193 from MITx/mm-rss-parser-fixes
Store rss instead of parser in memcache.
|
2012-07-17 11:27:58 -07:00 |
|
Matthew Mongeau
|
384f24064e
|
Store rss instead of parser in memcache.
|
2012-07-17 14:26:20 -04:00 |
|
Bridger Maxwell
|
996fec4b63
|
Added a check that course enrolmments don't already exist before creating them.
|
2012-07-17 14:01:26 -04:00 |
|
Bridger Maxwell
|
9f84d9b6fd
|
Merge remote-tracking branch 'origin/master' into release/1.0
|
2012-07-17 13:56:44 -04:00 |
|
Bridger Maxwell
|
1a8d999663
|
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.
|
2012-07-17 13:54:54 -04:00 |
|
David Ormsbee
|
9f17e0b12e
|
Merge pull request #192 from MITx/mm-login-errors-display
Login errors should display on first failure.
|
2012-07-17 10:11:14 -07:00 |
|
Matthew Mongeau
|
ba959152b6
|
Login errors should display on first failure.
|
2012-07-17 13:09:14 -04:00 |
|
Galen Frechette
|
c5ce0bdfea
|
updates copy on about contact and faq, tweeks home page header
|
2012-07-17 13:02:46 -04:00 |
|
Matthew Mongeau
|
171e16f177
|
Use local feed as default
|
2012-07-17 12:56:30 -04:00 |
|
Galen Frechette
|
d55cd78c73
|
updates and imporves design of the home page header
|
2012-07-17 12:56:29 -04:00 |
|
Matthew Mongeau
|
2bfe0cb92d
|
Add parsed rss entries to home page with caching
|
2012-07-17 12:56:28 -04:00 |
|
bridger
|
04b8dbe0d5
|
Merge pull request #179 from MITx/course_start
Course start
|
2012-07-17 09:54:17 -07:00 |
|
Bridger Maxwell
|
2f4cf23b73
|
Merge remote-tracking branch 'origin/master' into course_start
Conflicts:
common/djangoapps/student/views.py
|
2012-07-17 12:53:27 -04:00 |
|
bridger
|
b4eb9ffd37
|
Merge pull request #191 from MITx/template_caching
Template caching
|
2012-07-17 09:50:50 -07:00 |
|
bridger
|
08ddd03b5d
|
Merge pull request #184 from MITx/template_caching
edX caching
|
2012-07-17 09:49:21 -07:00 |
|
Bridger Maxwell
|
615f11e27b
|
Merge remote-tracking branch 'origin/master' into template_caching
|
2012-07-17 12:47:53 -04:00 |
|
Calen Pennington
|
02a30ef05a
|
Merge pull request #188 from MITx/dormsbee/portal_display_tweaks
Dormsbee/portal display tweaks
|
2012-07-17 08:42:42 -07:00 |
|