Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,481 Commits 1 Branch 0 Tags
39769ea99778dfbb46eb7b17389819c8ebabe9f5
Commit Graph

1258 Commits

Author SHA1 Message Date
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Carlos Andrés Rocha
d0221808db Merge pull request #1228 from MITx/content/rocha/media-kit 
Add new tab/window behavior to media kit
 2013-01-04 07:07:43 -08:00
Brian Talbot
04524ef58f media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text 2013-01-04 10:02:14 -05:00
Carlos Andrés Rocha
c3d7bbe0e0 Merge pull request #1225 from MITx/content/rocha/media-kit 
Minor style changes to home page and media kit page

[Finishes #41872203]
 2013-01-03 15:07:55 -08:00
Carlos Andrés Rocha
25cb6d5a22 Minor style changes to home page and media kit page 
[#41872203]
 2013-01-03 18:06:22 -05:00
David Ormsbee
67dea0c3c3 Merge pull request #1224 from MITx/content/rocha/media-kit 
Add media kit page
 2013-01-03 14:50:57 -08:00
Brian Talbot
a67b54bf82 media kit - added initial styles to media kit page 2013-01-03 17:10:16 -05:00
Brian Talbot
e10e87e6ec media kit - revised link styling on homepage 2013-01-03 14:21:07 -05:00
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit 
[# 41872203]
 2013-01-03 13:28:45 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
valera-rozuvan
233a35e01e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
37c7967e8c Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
213ca3fa32 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
fd0ec0ed8a Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
de63541049 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
d0c72ebe16 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8af93229d3 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7cf848db9e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c4f336d8fd Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8f120f1d27 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c94530cb01 Added initial RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Brian Talbot
37e0d98fec course listings - new html and css for ordering - wip 2012-12-20 09:32:15 -05:00
Brian Talbot
4d13744622 added new visual status to course listings on edx.org 2012-12-19 16:56:32 -05:00
David Ormsbee
65ec8ae056 Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo 
edX's Zendesk Logo
 2012-12-19 13:15:26 -08:00
Calen Pennington
6905f7dfd1 Merge pull request #1183 from MITx/bug/dhm/ie7 
Bug/dhm/ie7
 2012-12-19 12:58:07 -08:00
Brian Talbot
4bcfa84519 adding zendesk logo for styling purposes 2012-12-19 14:25:59 -05:00
David Ormsbee
a53959a770 Merge pull request #1181 from MITx/content/rocha/new-courses-2013 
Add news announcement for spring 2013 courses
 2012-12-19 09:36:10 -08:00
Carlos Andrés Rocha
a239fe2ee7 Add google analytics to model signup and login panels 
[# 40805407]
 2012-12-19 12:07:34 -05:00
Carlos Andrés Rocha
6d85accad8 Add news announcement for spring 2013 courses 
[# 41258693]
 2012-12-19 11:49:55 -05:00
Don Mitchell
326d21d143 ie7 fixes: define indexOf, use charAt rather than [] to access string, 
put try/catch around fn that was throwing errors.
 2012-12-19 10:48:03 -05:00
Carlos Andrés Rocha
a725bae313 Merge pull request #1155 from MITx/style/btalbot/university-logos-gtown 
Revised Georgetown University seal/logo for edx.org use
 2012-12-14 07:04:38 -08:00
Brian Talbot
4602a9d654 universities - revised Georgetown University seal/logo for homepage/university page use 2012-12-14 09:52:00 -05:00
David Ormsbee
7dd2f48efc Merge pull request #1127 from MITx/bugfix/kevin/mathjax-rendering 
Bugfix/kevin/mathjax rendering
 2012-12-14 05:07:24 -08:00
Tom Giannattasio
bf9f9c1c48 added boxsizing polyfill 2012-12-12 17:03:12 -05:00
Tom Giannattasio
d1520792b8 removed extra width 2012-12-12 17:00:54 -05:00
Tom Giannattasio
b4321931a0 pearson ie7 bugs fixed (ish) 2012-12-12 16:59:38 -05:00
Don Mitchell
d1c0eb8fc2 Somehow linked file disappeared again. 2012-12-12 10:55:57 -05:00
Diana Huang
59829a897c Add error message when encountering an error posting back 
without a proper error response object
 2012-12-11 18:09:25 -05:00
Your Name
6b59fd4de2 update 2 2012-12-11 15:54:46 -05:00
Your Name
df5a62305c update 2012-12-11 15:51:17 -05:00
Your Name
343dde6e29 fixed coffeescript to render mathjax correctly 2012-12-11 15:47:20 -05:00
Diana Huang
0e54592175 Add skip button logic to the LMS 2012-12-11 14:40:30 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling 
Updates to the instructor grading pages
 2012-12-10 10:39:19 -08:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -05:00