Commit Graph

65817 Commits

Author SHA1 Message Date
David Ormsbee
44f5891fe2 Remove migration that conflicts with smooth_registration 2012-07-22 18:01:44 -04:00
Bridger Maxwell
e1ba957959 Added UC Berkeley press release to rss feed at bottom of index. 2012-07-22 17:55:37 -04:00
David Ormsbee
7192c30985 Move migration for new reg fields so as not to conflict with smooth_registration 2012-07-22 17:52:55 -04:00
David Ormsbee
942183d765 Merge branch 'release/1.0' into dormsbee/change_reg_fields 2012-07-22 17:50:46 -04:00
Bridger Maxwell
6caee537a1 Accidentally disabled cache_if_anonymous earlier. Re-enabling. 2012-07-22 17:40:27 -04:00
Bridger Maxwell
ed10dc43d9 Added UC Berkeley press release. Moved press releases to their own folder. 2012-07-22 17:35:10 -04:00
David Ormsbee
0103c405fc Tiny spacing issue with dashboard messages. 2012-07-22 17:16:17 -04:00
David Ormsbee
607e4859a7 Put course numbers, real start dates on Dashboard 2012-07-22 17:09:59 -04:00
David Ormsbee
fa51046949 Merge pull request #253 from MITx/smooth_registration
Smooth registration
2012-07-22 13:49:59 -07:00
Bridger Maxwell
9afb0f8b78 Disabled student migration 0011, which had not net effect and was causing InnoDB errors. 2012-07-22 16:32:15 -04:00
Bridger Maxwell
ef32adc1c9 Changed log level to exception. 2012-07-22 16:30:41 -04:00
David Ormsbee
7f3a443409 Change over to new reg fields (styling still broken) 2012-07-22 15:35:24 -04:00
Bridger Maxwell
d798b4ac7f Ignoring ie.css 2012-07-22 15:27:49 -04:00
David Ormsbee
679b19c94d Merge pull request #240 from MITx/unenroll
Unenroll
2012-07-22 12:23:02 -07:00
David Ormsbee
b7e00ad1f5 Merge pull request #252 from MITx/dormsbee/copy_edits_3
Dormsbee/copy edits 3
2012-07-22 12:22:26 -07:00
Bridger Maxwell
61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. 2012-07-22 14:52:49 -04:00
David Ormsbee
9bb8537976 Remove student migrations that were in LMS after the move to common.
Fortunately, the migrations that were lost won't mess things up. One
is a modification of country, which we're dropping anyway. Another
affects location, which is fine to leave as it was.
2012-07-22 10:02:22 -04:00
David Ormsbee
b67db2bbdb Minor UI tweaks to signup form 2012-07-22 01:59:57 -04:00
David Ormsbee
63de542050 Pull edX Fellow job description 2012-07-22 00:41:25 -04:00
David Ormsbee
edcaa18300 edX capitalization on jobs page 2012-07-22 00:19:27 -04:00
David Ormsbee
24235a62c4 Add IEEE Spectrum link to front page, change UC Berkeley title 2012-07-22 00:16:33 -04:00
David Ormsbee
da2c002abe Make sure homepage news/press links open in a new window. 2012-07-21 20:34:57 -04:00
David Ormsbee
e21e5284de Remove placeholder background image from courses and course about pages. 2012-07-21 20:27:04 -04:00
David Ormsbee
f213353613 Change how we display the start date to be internationally unambiguous. 2012-07-21 20:19:12 -04:00
David Ormsbee
04d1d0f075 Remove BostInno article reference from front page. 2012-07-21 19:52:46 -04:00
David Ormsbee
bcb1604526 Make press article links go to a new window. 2012-07-21 19:51:59 -04:00
Bridger Maxwell
2f4aba8042 If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account. 2012-07-21 17:52:28 -04:00
David Ormsbee
d7dd64905f Images needed for press page links 2012-07-21 16:16:31 -04:00
David Ormsbee
c4ee4e051b Ugly listing of articles in Press page.
The static press page is getting edited a lot in terms of both
content and styling. I didn't want to the RSS thing until we
figured out what it's supposed to look like and need in terms of
fields. I didn't want to add a view entry, urls.py, etc. for this,
so for now it just uses an Article namedtuple inline to make
updates a little easier.
2012-07-21 15:40:17 -04:00
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
David Ormsbee
53698ac2a4 Remove the mission statement until we can work on it a bit more. 2012-07-21 13:24:03 -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
Arjun Singh
d446081748 Added a filestore pointing at the directory of the file being run for xmodule tests 2012-07-20 13:31:11 -07: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