Bridger Maxwell
|
60b547273d
|
Registering now temporarily logs you in. A message is displayed on the dashboard, reminding you to activate your account. Logging in shows a reminder about activating.
|
2012-07-21 15:31:48 -04:00 |
|
Bridger Maxwell
|
660d11dc16
|
Merge remote-tracking branch 'origin/release/1.0' into unenroll
Conflicts:
lms/urls.py
|
2012-07-21 12:49:27 -04:00 |
|
Bridger Maxwell
|
dcafbca106
|
Added an index to course enrollment created field.
|
2012-07-21 12:44:25 -04:00 |
|
David Ormsbee
|
5330396844
|
Merge pull request #251 from MITx/kf-multicourse-design
Kf multicourse design
|
2012-07-21 09:39:32 -07:00 |
|
Calen Pennington
|
64b92c35cc
|
Include ie fixes in via django-pipeline
|
2012-07-20 19:54:07 -04:00 |
|
Kyle Fiedler
|
1b3f03e2e5
|
Added fixes for ie and an image change
|
2012-07-20 19:16:10 -04:00 |
|
David Ormsbee
|
d6a67ef94d
|
Merge pull request #250 from MITx/pmitros/release-fixes
Tracking issues, import/export scripts
|
2012-07-20 15:14:41 -07:00 |
|
David Ormsbee
|
83ea0a8c63
|
Merge pull request #248 from MITx/release_fixes
Added titles to pages. Removed some old files and broken urls.
|
2012-07-20 15:10:33 -07:00 |
|
Kyle Fiedler
|
e860756555
|
Changed around the video image
|
2012-07-20 16:58:26 -04:00 |
|
Bridger Maxwell
|
61c4b05e06
|
Merge remote-tracking branch 'origin/unenroll' into unenroll
|
2012-07-20 16:56:57 -04:00 |
|
Bridger Maxwell
|
764c20eb1b
|
Fixed enrollment issue where submission form was automatically sent when it opened on about page.
|
2012-07-20 16:56:39 -04:00 |
|
Bridger Maxwell
|
f337baedb0
|
Renamed enrollment date to created.
|
2012-07-20 16:48:04 -04:00 |
|
Kyle Fiedler
|
46887cbc7f
|
Added stars for required fields in sign up form
|
2012-07-20 16:47:24 -04:00 |
|
Piotr Mitros
|
b21ea5a8a4
|
Added import/export scripts
|
2012-07-20 16:39:19 -04:00 |
|
Piotr Mitros
|
0fb8a7b1c8
|
Middleware password fix. Needs Cale's cleanup
|
2012-07-20 16:38:45 -04:00 |
|
Bridger Maxwell
|
a20650b559
|
Added titles to pages that are currently public-facing.
|
2012-07-20 16:25:49 -04:00 |
|
Bridger Maxwell
|
d1b5b4d071
|
Removed prototype university profile page.
|
2012-07-20 16:13:34 -04:00 |
|
David Ormsbee
|
f3885f7e59
|
Merge pull request #243 from MITx/release_fixes
Dashboard show full name instead of location. Removed updatecachemiddleware.
|
2012-07-20 13:13:14 -07:00 |
|
Kyle Fiedler
|
81e7662afc
|
Added style for the unenroll links
|
2012-07-20 16:06:13 -04:00 |
|
Bridger Maxwell
|
5131d51f92
|
Removed old 6002x faq and press release.
|
2012-07-20 15:59:25 -04:00 |
|
Bridger Maxwell
|
186e5fc5e1
|
Cleaned up the urls file a bit, to remove urls that don't work. Also removed some unused stuff from static_template_views.
|
2012-07-20 15:56:48 -04:00 |
|
David Ormsbee
|
7b67e69ebf
|
Merge pull request #245 from MITx/kf-multicourse-design
Added style and better markup for the quotes on the jobs page
|
2012-07-20 12:48:29 -07:00 |
|
Kyle Fiedler
|
164b5b67db
|
Added style and better markup for the quotes on the jobs page
|
2012-07-20 15:42:22 -04:00 |
|
David Ormsbee
|
81349ca592
|
Merge pull request #244 from MITx/kf-multicourse-design
fixed school images and edited the contact page
|
2012-07-20 12:12:43 -07:00 |
|
Kyle Fiedler
|
d090506980
|
switched quotes
|
2012-07-20 15:10:38 -04:00 |
|
Bridger Maxwell
|
c499a1a563
|
Now displaying full name on the dashboard, instead of location. The icon is just a generic info icon, for now.
|
2012-07-20 14:55:01 -04:00 |
|
David Ormsbee
|
f5589a2c15
|
Merge pull request #242 from MITx/dormsbee/copy_edits_2
Dormsbee/copy edits 2
|
2012-07-20 11:53:36 -07:00 |
|
David Ormsbee
|
8671238da4
|
Merge branch 'release/1.0' into dormsbee/copy_edits_2
Conflicts:
lms/templates/university_profile/mitx.html
|
2012-07-20 14:52:50 -04:00 |
|
Kyle Fiedler
|
4dc527d119
|
fixed school images and edited the contact page
|
2012-07-20 14:48:28 -04:00 |
|
David Ormsbee
|
f5cc037658
|
Update about info from aboutedX_7.20.12.docx
|
2012-07-20 14:41:50 -04:00 |
|
Bridger Maxwell
|
96b41e93d1
|
Removed old todo comment.
|
2012-07-20 14:33:30 -04:00 |
|
David Ormsbee
|
a7caa464b7
|
Updates to the FAQ, removed 'objectives' subsection
|
2012-07-20 14:22:15 -04:00 |
|
Bridger Maxwell
|
7d8ded7bf3
|
Removed UpdateCacheMiddleware, which wasn't doing anything.
|
2012-07-20 14:06:49 -04:00 |
|
David Ormsbee
|
50a362a223
|
Merge pull request #241 from MITx/kf-multicourse-design
Kf multicourse design
|
2012-07-20 10:56:40 -07:00 |
|
Kyle Fiedler
|
148e20359e
|
Added social links and fixed header bug
|
2012-07-20 13:43:32 -04:00 |
|
Kyle Fiedler
|
28aaa88923
|
Make site fluid, add new homepage image
|
2012-07-20 13:43:32 -04:00 |
|
Kyle Fiedler
|
11dae2758b
|
Change some numbers
|
2012-07-20 13:43:31 -04:00 |
|
Bridger Maxwell
|
cdc2ff04f8
|
Added a datetime stamp to course enrollments.
|
2012-07-20 13:14:59 -04:00 |
|
Bridger Maxwell
|
36373bb457
|
Added an unenroll link (and confirmation) to the dashboard. Enrolling is now a POST of a form.
|
2012-07-20 12:21:35 -04:00 |
|
David Ormsbee
|
bcbf352886
|
Removed BosInno article
|
2012-07-20 11:28:14 -04:00 |
|
David Ormsbee
|
9c90592d82
|
Merge pull request #238 from MITx/kf-multicourse-design
Kf multicourse design
|
2012-07-20 08:21:52 -07:00 |
|
Kyle Fiedler
|
c7e43d98dc
|
Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case
|
2012-07-20 11:18:39 -04:00 |
|
Kyle Fiedler
|
cb8d08c85d
|
Remove lowercase edX in all caps
|
2012-07-20 11:11:47 -04:00 |
|
Kyle Fiedler
|
90d6cee672
|
Made the whole course container a link
|
2012-07-20 11:11:47 -04:00 |
|
Kyle Fiedler
|
4d63b58619
|
Added more social links and took the pointer off the media thats not a link
|
2012-07-20 11:11:46 -04:00 |
|
Calen Pennington
|
47892b8950
|
Merge pull request #237 from MITx/cpennington/rss-feed-fix
Don't start the rss feed with a blank line, as that causes some versions...
|
2012-07-20 07:22:06 -07:00 |
|
Calen Pennington
|
2017138f6c
|
Don't start the rss feed with a blank line, as that causes some versions of sax parser to fail
|
2012-07-20 09:31:29 -04:00 |
|
David Ormsbee
|
67ae7dee1a
|
Merge pull request #236 from MITx/dormsbee/copy_edits_1
Dormsbee/copy edits 1
|
2012-07-20 05:20:54 -07:00 |
|
David Ormsbee
|
8907b1210d
|
Initial commit of press release material. We'll move it after it's styled properly.
|
2012-07-20 08:18:49 -04:00 |
|
David Ormsbee
|
b717b0efd0
|
Add real news and announcements at the bottom of the homepage via internal RSS for now.
|
2012-07-20 07:21:11 -04:00 |
|