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

253 Commits

Author SHA1 Message Date
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
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
David Ormsbee
a86938ee93 New press articles 2012-07-25 18:09:26 -04:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -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
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
David Ormsbee
1d5e42f175 Remove very large, no longer used images 2012-07-24 00:05:13 -04:00
jarv
6666c2fe8a Merge pull request #285 from MITx/release_fixes 
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
 2012-07-23 16:25:03 -07:00
Kyle Fiedler
3008c17730 Added bottom margin for articles in help 2012-07-23 19:19:50 -04:00
Bridger Maxwell
1e1e777e04 Fixed bugs caused by modal cloning. Now, only video modals are cloned. 2012-07-23 19:19:27 -04:00
Kyle Fiedler
18ec7ca8e8 Added social links to the footer of the press release 2012-07-23 19:17:22 -04:00
David Ormsbee
2fb5bb6e86 Merge pull request #282 from MITx/kf-multicourse-design 
Added styles for help page
 2012-07-23 15:45:48 -07:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00
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
Bridger Maxwell
8c88ee5706 Added small thumbnails for articles in the rss feed. 2012-07-23 17:06:22 -04:00
Kyle Fiedler
0f4976e069 Added some small IE fixes 2012-07-23 16:53:39 -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
Matthew Mongeau
6962735b19 Clone and remove modal 2012-07-23 16:35:19 -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
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
David Ormsbee
40aaaeda25 Merge pull request #254 from MITx/uc_berkeley_press 
UC berkeley press
 2012-07-23 11:46:44 -07:00
Calen Pennington
7ef8b6ac1e Merge remote-tracking branch 'origin/release/1.0' 2012-07-23 14:27:29 -04:00
Kyle Fiedler
5150c993fe Run all images through compression 2012-07-23 14:12:20 -04: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
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