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

76 Commits

Author SHA1 Message Date
Rocky Duan
abe12ddd7c display loading status 2012-08-23 01:47:47 -07:00
Calen Pennington
55984e31fc Add HarvardX- and MITx- on-edx-logo.png files 2012-08-22 14:47:50 -04:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Tom Giannattasio
885efc47c4 darker background for increased contrast 2012-08-22 09:03:38 -04:00
Tom Giannattasio
557975458c Merge branch 'master' into feature/tomg/fall-design 2012-08-21 14:50:15 -04:00
Tom Giannattasio
ad5fcbe784 new header styles 2012-08-21 14:46:35 -04:00
Tom Giannattasio
3ffcb2615f fix merge conflicts 2012-08-20 18:07:32 -04:00
Tom Giannattasio
16190843e7 started reworking sidebar styles 2012-08-20 13:56:51 -04:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Kyle Fiedler
24ed4a4dae MAnage images 2012-08-16 12:06:20 -04:00
Kyle Fiedler
0804ff7a75 Added styles for single question and profile view 2012-08-15 13:51:10 -04:00
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Rocky Duan
ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol 
Conflicts:
	lms/templates/discussion/_thread.html
 2012-08-10 17:59:19 -07:00
Tom Giannattasio
5c14a1ce65 added admin controls to main post and comments 2012-08-08 16:42:19 -04:00
Kyle Fiedler
17d072711b Make the sidebar links more standard, and remove some of their styling 2012-08-08 16:27:47 -04:00
Rocky Duan
2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/urls.py
 2012-08-07 16:58:14 -04:00
Tom Giannattasio
2135ed5015 added vote arrows 2012-08-07 10:16:08 -04:00
Kyle Fiedler
ac960ab9df Add images for book and fix styles for wiki 2012-08-06 16:08:40 -04:00
Brittany Cheng
32cf7c6f66 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 11:26:17 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Rocky Duan
8228bebc2a Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:41:19 -04:00
Calen Pennington
c9e637d719 Make cms and lms tests run independently (they had been colliding on collectstatic) 2012-07-30 12:58:45 -04:00
Rocky Duan
9d2bccbee7 Merge branch 'master' of github.com:MITx/mitx 2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-26 09:05:57 -04:00
Rocky Duan
63633ae1d3 files for wmd editor 2012-07-25 20:47:11 -04:00
David Ormsbee
a86938ee93 New press articles 2012-07-25 18:09:26 -04:00
Calen Pennington
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
David Ormsbee
1d5e42f175 Remove very large, no longer used images 2012-07-24 00:05:13 -04:00
Bridger Maxwell
8c88ee5706 Added small thumbnails for articles in the rss feed. 2012-07-23 17:06:22 -04:00
Kyle Fiedler
5150c993fe Run all images through compression 2012-07-23 14:12:20 -04:00
Bridger Maxwell
0cac360225 Added a favicon. 2012-07-22 18:49:10 -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
d7dd64905f Images needed for press page links 2012-07-21 16:16:31 -04:00
Kyle Fiedler
1b3f03e2e5 Added fixes for ie and an image change 2012-07-20 19:16:10 -04:00
Kyle Fiedler
4dc527d119 fixed school images and edited the contact page 2012-07-20 14:48:28 -04:00
Kyle Fiedler
148e20359e Added social links and fixed header bug 2012-07-20 13:43:32 -04:00
Kyle Fiedler
28aaa88923 Make site fluid, add new homepage image 2012-07-20 13:43:32 -04:00
Kyle Fiedler
c7e43d98dc Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case 2012-07-20 11:18:39 -04:00
Kyle Fiedler
4d63b58619 Added more social links and took the pointer off the media thats not a link 2012-07-20 11:11:46 -04:00
Kyle Fiedler
f1ca467863 Added some organization to the images and started to make them smaller, replace the homepage image 2012-07-19 15:20:32 -04:00
Matthew Mongeau
1b4460360d Update harvard image. 2012-07-19 13:34:38 -04:00
Matthew Mongeau
e9d8cbb80b Updated jobs copy 2012-07-19 13:34:38 -04:00
Galen Frechette
48d39ee7d2 fixes coursse about header to accept very long course names, fixes icons on course about sidebar 2012-07-19 02:33:58 -04:00
David Ormsbee
74b00bc05b Swap out the homepage and courses banner image for something school-neutral (this is temporary) 2012-07-18 19:58:38 -04:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
Galen Frechette
7af062ea33 updates UC Berkeley logo 2012-07-17 22:15:28 -04:00