Matthew Mongeau
343f5a5393
Add dek to berkeley story.
2012-07-23 13:10:05 -04:00
David Ormsbee
f921726b3a
Final, blessed FAQ
2012-07-23 12:48:19 -04:00
Calen Pennington
652aa52001
Merge pull request #260 from MITx/split-sass
...
Split sass
2012-07-23 09:43:17 -07:00
Kyle Fiedler
9286d9f16a
Added changes to the way that css is linked
2012-07-23 12:40:41 -04:00
Kyle Fiedler
b49a6586be
Added course stylesheet to courseware template
2012-07-23 12:38:22 -04:00
Kyle Fiedler
e6465e420a
Changed around the css
2012-07-23 12:38:21 -04:00
Piotr Mitros
edc02f7cbc
Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0
2012-07-23 12:27:46 -04:00
Piotr Mitros
5db41d0de8
Missing space before DFAQ
2012-07-23 12:26:53 -04:00
David Ormsbee
c5849805ed
Merge pull request #264 from MITx/mm-video-fixes-for-index
...
Add rel=0 to all lightbox videos.
2012-07-23 09:23:36 -07:00
Matthew Mongeau
315063ffed
Add rel=0 to all lightbox videos.
2012-07-23 12:09:09 -04:00
Kyle Fiedler
8eeeac716b
Added some design changes to the homepage header
2012-07-23 12:06:17 -04:00
David Ormsbee
3087ec6c91
Merge pull request #259 from MITx/feature/cpennington/minimize_js_requests
...
Consolidate javascript at the bottom of the page and in a minimal number of django-pipeline groups
2012-07-23 08:41:29 -07:00
Matthew Mongeau
ee72a725bb
Sort by course number. Simplify university grouping.
2012-07-23 11:38:01 -04:00
Calen Pennington
d19e50aeb6
Merge remaining js files into django-pipeline groups
2012-07-23 11:27:22 -04:00
Calen Pennington
d2d29b2cf9
Move most javascript loading to below the body, rather than head
2012-07-23 11:27:22 -04:00
Calen Pennington
5915532a57
Consolidate code used for disabling USE_DJANGO_PIPELINE feature
2012-07-23 11:27:22 -04:00
Calen Pennington
5dd4e19c0b
Move vendor js into a single file
2012-07-23 10:24:50 -04:00
Bridger Maxwell
9ebac1bdd7
Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware.
2012-07-23 08:18:37 -04:00
David Ormsbee
9d81a8becb
Merge pull request #256 from MITx/dormsbee/change_reg_fields
...
Dormsbee/change reg fields
2012-07-22 16:13:52 -07:00
Rocky Duan
784bd26510
forum view for discussions
2012-07-22 19:05:32 -04:00
David Ormsbee
074fc24343
Fix up the signup modal for registration for the new fields.
2012-07-22 18:53:12 -04:00
Bridger Maxwell
0cac360225
Added a favicon.
2012-07-22 18:49:10 -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
942183d765
Merge branch 'release/1.0' into dormsbee/change_reg_fields
2012-07-22 17:50:46 -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
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
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
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
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
