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

1383 Commits

Author SHA1 Message Date
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
Victor Shnayder
e97469aee6 Merge pull request #1236 from MITx/diana/peer-grading-views 
Peer Grading Interface
 2013-01-10 13:59:46 -08:00
Carlos Andrés Rocha
8f21d7a738 Add property to course module to check if a course is new 
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.

Also adds a property to check how many days are left until the course starts.
 2013-01-10 15:57:29 -05:00
Diana Huang
c4d1b2e643 Use correct user id and make the reload button a back button 2013-01-09 14:41:23 -05:00
Diana Huang
3f254fc3c7 Merge branch 'master' into diana/peer-grading-views 2013-01-07 15:57:39 -05:00
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
56f1c6aad9 Fixed extra characters in faq page 2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256 Fix typo in the job page 
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org>
 2013-01-07 10:08:16 -05:00
Diana Huang
e410703e33 Minor bug fixes and improvements 2013-01-04 17:20:03 -05:00
Diana Huang
093560e859 Updates to copy and styling and a few bugfixes 2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a Add interstitial page between calibration and grading. 
Make individual Prompt and Rubric Sections hideable.
 2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626 Improvements to calibration feedback step 2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
d2228205e2 Merge branch 'master' into diana/peer-grading-views 2013-01-04 11:19:10 -05:00
Diana Huang
b5f34a9da6 Show special text when calibrating or when grading. 2013-01-04 11:03:24 -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
95e7f2f1eb Merge pull request #1226 from MITx/content/rocha/media-kit 
Fix error in one of the media kit assets URLs
 2013-01-03 15:30:08 -08:00
Carlos Andrés Rocha
59f4962cfa Fix error in one of the media kit assets URLs 2013-01-03 18:29:34 -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
Carlos Andrés Rocha
2e6ac2f72c Fix link to root page on the main page footer 2013-01-03 17:21:54 -05:00
Brian Talbot
a67b54bf82 media kit - added initial styles to media kit page 2013-01-03 17:10:16 -05:00
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
Brian Talbot
e10e87e6ec media kit - revised link styling on homepage 2013-01-03 14:21:07 -05:00
Diana Huang
becffd4dbb Updated html and javascript for new pages as well 
as a fix for the peer grading service
 2013-01-03 14:08:56 -05:00
Diana Huang
c0001597a3 Update some of the templates so that they don't break 2013-01-03 13:47:29 -05:00
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit 
[# 41872203]
 2013-01-03 13:28:45 -05:00
Diana Huang
962d83d71b Display a message when there are no problems to grade 2013-01-03 13:00:02 -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
Diana Huang
c89ff2ac0e Basic peer grading view using mocks and some cleanup in 
the peer grading service
 2013-01-02 17:44:58 -05:00
Diana Huang
8737009679 Merge branch 'master' into diana/peer-grading-views 2013-01-02 15:04:18 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages 
and the problem list page
 2013-01-02 15:01:59 -05:00
Jay Zoldak
56d17d8a8a Improve some comments and names in the acceptance test framework 2013-01-02 10:44:21 -05:00
Jay Zoldak
af4f1668d7 Stub out the video and capture the html files of the high level tabs for diff comparison 
Conflicts:
	lms/templates/video.html
 2013-01-02 10:44:20 -05:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course 
Visual changes for ungraded courses
 2013-01-02 07:19:34 -08:00
Diana Huang
deffa188ff Fix some minor problems and add new key for peer grading. 2013-01-02 09:43:21 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
David Ormsbee
241b4eb0fe Merge pull request #1196 from MITx/feature/rocha/change-courses-layout 
New Layout for course listings with new course graphical overlay
 2012-12-21 12:18:05 -08:00
Carlos Andrés Rocha
4959dc6005 Add Instructional Designer Job Post 2012-12-21 11:44:45 -05:00
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
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
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