Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
David Ormsbee
0832373859 Merge pull request #281 from MITx/kf-multicourse-design 
IE fixes!!!!!!!!!!!!!!!
 2012-07-23 15:24:27 -07:00
Kyle Fiedler
2cb9e2997e Move the shiv back to the header 2012-07-23 18:22:21 -04:00
Kyle Fiedler
63faa76e2a More small ie fixes 2012-07-23 17:49:48 -04:00
David Ormsbee
a0aa2ab2b8 Merge pull request #280 from MITx/release_fixes 
Added small thumbnails for articles in the rss feed.
 2012-07-23 14:14:47 -07:00
Bridger Maxwell
8c88ee5706 Added small thumbnails for articles in the rss feed. 2012-07-23 17:06:22 -04:00
David Ormsbee
756ecc8fec Merge pull request #279 from MITx/release_fixes 
edX press release in feed now references png logo instead of jpg with artifacts.
 2012-07-23 13:59:38 -07:00
Bridger Maxwell
443f9f5908 Comma for the press release. 2012-07-23 16:54:35 -04:00
Kyle Fiedler
0f4976e069 Added some small IE fixes 2012-07-23 16:53:39 -04:00
Bridger Maxwell
f1936af9ef edX press release in feed now references png logo instead of jpg with artifacts. 2012-07-23 16:44:11 -04:00
David Ormsbee
0d80a938ad Merge pull request #278 from MITx/mm-modal-clone 
Clone and remove modal
 2012-07-23 13:37:30 -07:00
David Ormsbee
bfdd9bacbb Merge pull request #274 from MITx/mm-update-index-video 
Update index video.
 2012-07-23 13:35:56 -07:00
Matthew Mongeau
6962735b19 Clone and remove modal 2012-07-23 16:35:19 -04:00
Calen Pennington
4d1c046a7f Merge pull request #277 from MITx/cpennington/pipelining-course-data 
Use django-pipeline to read course static files.
 2012-07-23 13:34:25 -07:00
Calen Pennington
b8b133d30c Replace /static urls in all course snippets 2012-07-23 16:31:52 -04:00
Calen Pennington
4984f9d804 Use django-pipeline to read course static files. 
Requires the replacement of {COURSE_STATIC_URL} with just /static/
in about/overview.html files.
 2012-07-23 16:22:45 -04:00
Rocky Duan
fdab215eb4 moved django_comment_client into edx 2012-07-23 16:20:45 -04:00
Bridger Maxwell
c6f0c57b5e Fixed typo where favicon was references as image/image/x-icon 2012-07-23 16:19:41 -04:00
Bridger Maxwell
95f7e99d36 Changed press release to say UC Berkeley. 2012-07-23 16:18:57 -04:00
Bridger Maxwell
abd1900ac1 Fixed principle/principal typo in press release. 2012-07-23 16:15:08 -04:00
David Ormsbee
64ecd3a211 Merge pull request #275 from MITx/uc_berkeley_press 
Added contact info on Berkeley press release.
 2012-07-23 12:52:16 -07:00
Rocky Duan
616eaf2500 integrated search; refactored some frontend code 2012-07-23 15:41:09 -04:00
Bridger Maxwell
e1ad3539b6 Updated contact information on press release. 2012-07-23 15:40:10 -04:00
Kyle Fiedler
b4d08f820e Chage placement of the read more link 2012-07-23 15:28:24 -04:00
Bridger Maxwell
f6b4475309 Added contact info on Berkeley press release. 2012-07-23 15:22:06 -04:00
Kyle Fiedler
c2b426afeb prereqs float right 2012-07-23 15:14:04 -04:00
Matthew Mongeau
2524e6313a Update index video. 2012-07-23 15:08:19 -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
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -04: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
Calen Pennington
7ef8b6ac1e Merge remote-tracking branch 'origin/release/1.0' 2012-07-23 14:27:29 -04:00
Matthew Mongeau
46e33392d6 Use 'true' for remember value. 2012-07-23 14:27:16 -04: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
Calen Pennington
ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-23 13:55:20 -04:00
David Ormsbee
07f246f355 Add new, officially sanctioned final edX honor code. 2012-07-23 13:49:24 -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