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

12296 Commits

Author SHA1 Message Date
Vik Paruchuri
9cca3072c3 Fix skip behavior for staff 2013-04-09 13:53:51 -04:00
Kevin Chugh
8358e5162a Merge branch 'master' into feature/kevin/flagging 2013-04-09 09:23:05 -04:00
Calen Pennington
63b5153cde Clean up violations from ichuang's PR 2013-04-08 15:08:23 -04:00
chrisndodge
146f09b788 Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change 
xblock changed attribute names from 'student' to 'user'. Need to update ...
 2013-04-08 08:20:19 -07:00
Chris Dodge
0949754cd4 xblock changed attribute names from 'student' to 'user'. Need to update consumers 2013-04-08 10:56:40 -04:00
chrisndodge
4b925520b8 Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix 
fix typo in instructor dashboard dump grading config
 2013-04-08 07:28:22 -07:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00
cahrens
e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:38:52 -04:00
ichuang
51d882b7b0 fix typo in instructor dashboard dump grading config 2013-04-06 18:32:23 +00:00
Chris Dodge
5b7d882e3e Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements 2013-04-06 11:02:21 -04:00
Kevin Chugh
24095679a6 add back comment response flagging 2013-04-05 19:04:18 -04:00
Kevin Chugh
de7c511328 flagging working again 2013-04-05 16:39:22 -04:00
Chris Dodge
e717244611 remove discussion cache, which isn't used 2013-04-05 15:27:50 -04:00
Kevin Chugh
0e8ef28347 flagging almost done 2013-04-05 13:23:09 -04:00
Chris Dodge
f84eaf01b8 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-05 13:20:02 -04:00
Chris Dodge
3d7f893259 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision 2013-04-05 13:19:10 -04:00
Calen Pennington
262050e4ff Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard 
add dump of description of grading configuration to instructor dashboard
 2013-04-05 06:30:43 -07:00
ichuang
3b371c17e1 fix syntax error in lms/djangoapps/instructor/views.py 2013-04-05 02:59:24 +00:00
ichuang
8d770c1c04 use isinstance for grader check in lms/djangoapps/instructor/views.py 2013-04-05 02:54:05 +00:00
Christina Roberts
de44813732 Merge pull request #1808 from MITx/bug/christina/studio 
Show course end date on course about page
 2013-04-04 13:34:00 -07:00
cahrens
57343c7d9e On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:35:07 -04:00
cahrens
d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:22:56 -04:00
Calen Pennington
99424a9716 Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error 
fix IntegrityError duplicate entry issue with module_data Scope.student_state update
 2013-04-04 11:57:59 -07:00
Calen Pennington
e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup 
clean up xqueue callback url generation; allow override from settings
 2013-04-04 11:54:13 -07:00
Calen Pennington
ff8dca943c Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix 
fix lms migration to be compatible with xblock
 2013-04-04 11:17:38 -07:00
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
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
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 Wilson
b6f95c71ce change command to handle file input instead 2013-04-02 16:20:46 -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
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
Brian Wilson
1abfff220e when grading, check for always-regrade at the section level too 2013-04-01 14:14:12 -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
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