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

7051 Commits

Author SHA1 Message Date
Calen Pennington
72ce1af982 Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands 
fix forum management commands (assign_default_role was moved)
 2013-04-04 10:14:31 -07:00
Calen Pennington
7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock 
Migrate to the open source XBlock repo
 2013-04-04 10:12:00 -07:00
Brian Wilson
d3e7739b3b add user name and email to progress page 2013-04-04 12:03:08 -04:00
John Jarvis
ea6174af28 fixing image resolution for the stanford-university image 2013-04-04 11:40:44 -04:00
Brian Wilson
4c511c3c66 add progress logging 2013-04-04 11:14:52 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -04:00
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix 
fix psychometrics to be compatible with new xblocks
 2013-04-04 05:50:59 -07:00
John Jarvis
d2313d851a renaming image 2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -04:00
John Jarvis
e8ee6616c4 removing old logo 2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82 dding stanford-univ logo 2013-04-03 15:39:22 -04:00
John Jarvis
1c581835f2 changing stanford logo 2013-04-03 15:39:11 -04:00
John Jarvis
71cfc4441b university->logo 2013-04-03 15:37:12 -04:00
John Jarvis
0c81329fa5 updating image link 2013-04-03 15:35:50 -04:00
John Jarvis
7b226c34f8 Adding new logo for stanford 2013-04-03 15:34:54 -04:00
Victor Shnayder
9f9748b9fa Stanford press release 2013-04-03 14:26:06 -04:00
Chris Dodge
b640866748 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	common/lib/xmodule/xmodule/x_module.py
 2013-04-03 14:05:59 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
brianhw
7c9875870b Merge pull request #1770 from MITx/fix/brian/remove-input_state 
management command to remove excess input_state entries
 2013-04-03 07:35:47 -07:00
Brian Wilson
b11f0e17f7 respond to feedback 2013-04-03 10:22:43 -04:00
Brian Talbot
f501000825 edx.org - hiding the login nav element when on the login view 2013-04-03 09:46:36 -04:00
Brian Talbot
fa898d0589 edx.org - revising register field label per marketing's request 2013-04-03 09:13:48 -04:00
Brian Wilson
b6f95c71ce change command to handle file input instead 2013-04-02 16:20:46 -04:00
cahrens
42fbc16006 Feedback from code review. 2013-04-02 14:10:56 -04:00
Kevin Chugh
daa0cd22d5 filter implemented for flagged 2013-04-01 23:16:22 -04:00
Victor Shnayder
c5869c76b6 Merge pull request #1782 from MITx/feature/ichuang/allow-reset-of-openended-problems 
allow student state of module other than problem to be reset by instructor
 2013-04-01 15:11:59 -07:00
ichuang
025c5df16e fix IntegrityError duplicate entry issue with module_data Scope.student_state update 2013-04-01 21:51:45 +00:00
ichuang
5477d6430a add instructions to idashboard for deleting state of non-problem xblocks 2013-04-01 19:59:20 +00:00
cahrens
8b26d3a8a1 Protect against no due property (as was there before). 2013-04-01 14:42:05 -04:00
cahrens
ee2b92ab02 Protect against no due property (as was there before). 2013-04-01 14:38:56 -04:00
cahrens
845e86b8d1 Format timestamp. 2013-04-01 14:32:03 -04:00
jarv
b7fba98e2a Merge pull request #1790 from MITx/fix/cdodge/certificates-db-perf-optimization 
optimize db round trips, by getting the course descriptor outside of the...
 2013-04-01 11:26:29 -07:00
Victor Shnayder
140ad8bf61 Merge pull request #1791 from MITx/fix/brian/foldit-grading 
when grading, check for always-regrade at the section level too
 2013-04-01 11:18:58 -07:00
cahrens
b1ee96b38e Format timestamp. 2013-04-01 14:18:15 -04:00
Brian Wilson
1abfff220e when grading, check for always-regrade at the section level too 2013-04-01 14:14:12 -04:00
cahrens
055538e213 Format timestamp. 2013-04-01 14:10:48 -04:00
Victor Shnayder
ba7d29b3e7 Merge pull request #1763 from MITx/fix/brian/single_section_grading 
modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections
 2013-04-01 11:06:44 -07:00
Chris Dodge
8fef830740 optimize db round trips, by getting the course descriptor outside of the user loop 2013-04-01 14:02:54 -04:00
Kevin Chugh
2f4310713b fix index 2013-04-01 13:22:56 -04:00
brianhw
98a717b6b2 Merge pull request #1771 from MITx/feature/rocha/enable-sass-source-maps 
Enable dev env support for sass source maps
 2013-04-01 09:44:57 -07:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Victor Shnayder
9c4a88b570 Merge pull request #1743 from MITx/fix/will/bug_288 
Fix/will/bug 288
 2013-04-01 07:22:20 -07:00
ichuang
cac7f8a289 allow student state of module other than problem to be reset by instructor 
this makes it possible to reset open ended response problems
 2013-03-31 19:43:39 +00:00
ichuang
15d1bc372d clean up xqueue callback url generation; allow override from settings 2013-03-31 19:40:39 +00:00
ichuang
de5fa56b19 add dump of description of grading configuration to instructor dashboard 2013-03-31 13:18:54 +00:00
ichuang
febcb51133 make psychometrics curve fitting more robust 2013-03-31 12:52:29 +00:00
ichuang
26f14aaf6d fix psychoanalyze (compatibility with new xblock) 2013-03-31 12:41:12 +00:00
ichuang
f1cc6e8597 fix psychoanalyze - make compatible with xblock 2013-03-31 12:40:43 +00:00