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

6923 Commits

Author SHA1 Message Date
David Ormsbee
f43c93e1d8 Merge pull request #1189 from MITx/fix/rocha/login-redirect 
Fix django auth login redirection
 2012-12-21 08:20:18 -08:00
Carlos Andrés Rocha
8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay 2012-12-21 11:12:21 -05:00
Brian Wilson
2788ad8629 switch back to returning json to test_center_register template, and enable jquery handling in template. 2012-12-21 01:39:18 -05: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
Carlos Andrés Rocha
a0d1d98c92 Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout 2012-12-20 17:45:19 -05:00
Carlos Andrés Rocha
6ad6d348e6 Correct some spring courses announcement information 
[#41545421]
 2012-12-20 13:25:10 -05:00
Brian Talbot
76f6ee1877 test center - reorg of HTML - wip 2012-12-20 13:00:08 -05:00
Brian Talbot
5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip 2012-12-20 12:24:31 -05:00
Brian Talbot
f92266d659 course listings - new html and css for ordering - finished sass changes and static markup example 2012-12-20 09:55:52 -05:00
Brian Talbot
37e0d98fec course listings - new html and css for ordering - wip 2012-12-20 09:32:15 -05:00
Brian Wilson
d5bd2313c1 fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics. 2012-12-20 04:16:00 -05:00
Carlos Andrés Rocha
5d85fab283 Fix django auth login redirection 
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.

We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.

[#41499213]
 2012-12-19 18:48:30 -05:00
Brian Talbot
4d13744622 added new visual status to course listings on edx.org 2012-12-19 16:56:32 -05:00
Brian Wilson
ee99080687 add additional fields to testcenter user and update test center registration. 2012-12-19 16:53:13 -05:00
Carlos Andrés Rocha
b334394473 Fix links for Software as a Service courses 2012-12-19 16:13:17 -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
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
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
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
ede96d777d Add member services job descriptions 
[#40869383]
 2012-12-13 14:27:04 -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
Diana Huang
0e54592175 Add skip button logic to the LMS 2012-12-11 14:40:30 -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
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
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Diana Huang
c9d399d3bd Update instructor grading message with more accurate information 2012-12-10 09:35:30 -05:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities 
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
 2012-12-10 03:32:41 -08:00
JM Van Thong
27b8f01ffa Added the following analyzers: StudentsActive, OverallGradeDistribution, StudentsDropoffPerDay. 2012-12-07 17:26:33 -05:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make 
the feedback box less important.
 2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
275c9ef7fd Update API with server and add new meta info box for meta information 2012-12-07 17:01:27 -05:00
Diana Huang
aee1e5e9a9 Updates to the list view and error container 2012-12-07 17:01:27 -05:00
Diana Huang
fcc1ab71f6 Update the formatting and layout of the Instructor Grading interface. 2012-12-07 17:01:27 -05:00
Diana Huang
b5f3386d27 Add breadcrumbing and clarify some of the text on the 
instructor grading interface.
 2012-12-07 17:01:27 -05:00
Diana Huang
94e1a9ffd3 Clean up some minor issues with list view 
and display some new information on the problem-specific page
 2012-12-07 17:01:26 -05:00
Kevin Chugh
368b59a9e6 updated tooltips 2012-12-07 15:39:53 -05:00
Carlos Andrés Rocha
cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ 
[#40805397]
 2012-12-07 11:59:13 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00