Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,420 Commits 1 Branch 0 Tags
c2b426afebc571eccbb67f192d1f5bbc144114ef
Commit Graph

3420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
c2b426afeb prereqs float right 2012-07-23 15:14:04 -04:00
David Ormsbee
8613555ccf Merge pull request #272 from MITx/release_fixes 
Removed copyright page, until it can be updated for edX.
 2012-07-23 11:52:51 -07:00
Bridger Maxwell
458abbad9f Removed copyright page, until it can be updated for edX. 2012-07-23 14:48:19 -04:00
David Ormsbee
40aaaeda25 Merge pull request #254 from MITx/uc_berkeley_press 
UC berkeley press
 2012-07-23 11:46:44 -07:00
David Ormsbee
268ab28692 Merge pull request #271 from MITx/mm-login-form-fixes 
Use 'true' for remember value.
 2012-07-23 11:45:17 -07:00
Calen Pennington
abf491ffe8 Merge pull request #269 from MITx/kf-multicourse-design 
Run all images through compression
 2012-07-23 11:34:17 -07:00
Matthew Mongeau
46e33392d6 Use 'true' for remember value. 2012-07-23 14:27:16 -04:00
bridger
0b3da68fac Merge pull request #270 from MITx/dormsbee/course_img_jpg 
Use JPGs instead of PNG for course images
 2012-07-23 11:24:45 -07:00
David Ormsbee
80c04e1414 Use JPGs instead of PNG for course images 2012-07-23 14:16:54 -04:00
Kyle Fiedler
5150c993fe Run all images through compression 2012-07-23 14:12:20 -04:00
Bridger Maxwell
c41433f618 Updated UC Berkeley press release to latest from word doc. 2012-07-23 14:09:41 -04:00
David Ormsbee
8be3f4f9c9 Merge pull request #268 from MITx/kf-multicourse-design 
Make things more fluid
 2012-07-23 10:59:16 -07:00
David Ormsbee
ae879e86b2 Merge pull request #267 from MITx/dormsbee/copy_edits_5 
Dormsbee/copy edits 5
 2012-07-23 10:58:53 -07:00
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
David Ormsbee
07f246f355 Add new, officially sanctioned final edX honor code. 2012-07-23 13:49:24 -04: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
Bridger Maxwell
a0990b6bb5 Added redirect from pressrelease to press/uc-berkeley-joins-edx 2012-07-23 13:46:19 -04:00
Bridger Maxwell
863071c9a5 Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press 
Conflicts:
	lms/urls.py
 2012-07-23 13:44:04 -04:00
Bridger Maxwell
126ff06f3b Typo fixes to UC Berkeley press release. 2012-07-23 13:43:09 -04:00
David Ormsbee
cff42ead22 Add official edX privacy policy. 2012-07-23 13:41:03 -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
David Ormsbee
81fdc2d9ab edX Terms of Service added 2012-07-23 13:30:17 -04:00
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
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