Kyle Fiedler
54516a9560
Fix grid and make sure that everything is fluid
2012-07-23 13:56:44 -04:00
Kyle Fiedler
6da83900aa
Added min width for container
2012-07-23 13:56:44 -04:00
Kyle Fiedler
b557363ac2
Added som fixed for fluid design
2012-07-23 13:56:44 -04:00
David Ormsbee
b9c6e36616
Merge pull request #266 from MITx/cpennington/fix_tests
...
Cpennington/fix tests
2012-07-23 10:51:31 -07:00
Calen Pennington
7a34a8c342
Fix failing tests
2012-07-23 13:49:11 -04:00
Arjun Singh
11eaab2726
Added a filestore pointing at the directory of the file being run for xmodule tests
2012-07-23 13:48:02 -04:00
David Ormsbee
b7a389dff5
Merge pull request #265 from MITx/mm-dek
...
Add dek to berkeley story.
2012-07-23 10:30:56 -07:00
Matthew Mongeau
343f5a5393
Add dek to berkeley story.
2012-07-23 13:10:05 -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
Calen Pennington
50e8b0a814
Merge pull request #261 from MITx/kf-multicourse-design
...
Added some design changes to the homepage header
2012-07-23 09:13:31 -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
David Ormsbee
e68aa55bb0
Merge pull request #258 from MITx/mm-sort-courses-by-course-number
...
Sort by course number. Simplify university grouping.
2012-07-23 08:38:54 -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
Calen Pennington
67a18ec555
Merge pull request #257 from MITx/bridger/js_slim
...
Javascript slim
2012-07-23 06:56:50 -07: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
David Ormsbee
06c2d1f10e
Merge pull request #255 from MITx/release_fixes
...
Added a favicon.
2012-07-22 15:58:02 -07: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
David Ormsbee
44f5891fe2
Remove migration that conflicts with smooth_registration
2012-07-22 18:01:44 -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
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
