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

22621 Commits

Author SHA1 Message Date
David Ormsbee
65ec8ae056 Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo 
edX's Zendesk Logo
 2012-12-19 13:15:26 -08:00
Carlos Andrés Rocha
b334394473 Fix links for Software as a Service courses 2012-12-19 16:13:17 -05: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
Bridger Maxwell
d911297670 The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade. 2012-12-19 12:47:43 -05:00
Bridger Maxwell
5a65c24507 Added parameters to hide grade totals and grade cutoffs in progress graph. 2012-12-19 12:37:02 -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
David Ormsbee
ed051a50a2 Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration 
Add google analytics to model signup and login panels
 2012-12-19 09:12:50 -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
Carlos Andrés Rocha
42857796c0 Update jobs and faq page 
[#41258701 #41258685]
 2012-12-19 11:39:44 -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
Brian Wilson
f472ac60f5 minor tweaks to test center registration 2012-12-19 00:21:49 -05:00
Brian Wilson
bc40a7f127 make test-reg dialog non-modal, and pass course_id in URL. Add to course info. 2012-12-18 16:16:55 -05:00
Don Mitchell
5709ff34f5 Refactored videos to a much simpler impl b/c about videos don't have 
speeds and don't use the video/default.yaml format.
 2012-12-18 12:46:54 -05:00
Brian Wilson
c7d379beb6 add first pass at wiring test registration dialog 2012-12-18 03:20:02 -05:00
Brian Wilson
b2117c1194 first dialogs 2012-12-17 17:59:44 -05:00
David Ormsbee
0ddea6d0ae Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx 
Feature/alex/video timeframe mitx
 2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -05:00
JM Van Thong
e40b0d0d08 Fixed data order when loading json record from request. 2012-12-14 17:16:57 -05:00
Tom Giannattasio
f3067cd8c8 restyling of dashboard with pearson exam notifications 2012-12-14 16:17: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
Carlos Andrés Rocha
909ab2b5f6 Merge pull request #1146 from MITx/content/rocha/job-page-update 
Add member services job descriptions

[Finished #40869383]
 2012-12-13 14:42:38 -08:00
David Ormsbee
97ab513a10 Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage 
Ignore discussion modules with missing keys when building the global dis...
 2012-12-13 12:20:57 -08:00
Carlos Andrés Rocha
ede96d777d Add member services job descriptions 
[#40869383]
 2012-12-13 14:27:04 -05: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
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Don Mitchell
d1c0eb8fc2 Somehow linked file disappeared again. 2012-12-12 10:55:57 -05:00
Calen Pennington
96daea5c0a Ignore discussion modules with missing keys when building the global discussion info 2012-12-12 09:40:31 -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
Diana Huang
4e81d9b2c5 Add some helpful indents and move the submission box to make 
grading easier to read
 2012-12-11 16:10:26 -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
41167a49a1 Merge branch 'master' into bugfix/kevin/mathjax-rendering 2012-12-11 15:47:43 -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
Diana Huang
33f2d55a37 new test for problem lists 2012-12-11 14:40:30 -05:00
Chris Dodge
0e3a022086 fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo 2012-12-11 11:21:08 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Kevin Chugh
6e108c7531 fix conflict 2012-12-10 19:30:04 -05:00
Diana Huang
4a2dabd30a new test for problem lists 2012-12-10 16:31:43 -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
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Victor Shnayder
85b5190c29 fix login hack. Uses new return-error-msg-if-not-logged-in behavior 2012-12-10 10:41:40 -05:00