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

6956 Commits

Author SHA1 Message Date
Vik Paruchuri
c55f997086 Fix self assessment tests 2013-02-20 17:34:51 -05:00
Arthur Barrett
a982ebbb03 Refactored rendered method and added span ids. 2013-02-20 17:33:11 -05:00
Vik Paruchuri
912800cabf Fix location string object problems 2013-02-20 17:27:37 -05:00
Vik Paruchuri
a8fadb0ecc Remove render to string import 2013-02-20 17:16:38 -05:00
Vik Paruchuri
19a80c6268 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 17:12:53 -05:00
Vik Paruchuri
d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:49:59 -05:00
Vik Paruchuri
ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:43:04 -05:00
Vik Paruchuri
26a2e059c8 Actually display ETA message 2013-02-20 16:36:40 -05:00
Vik Paruchuri
111ef30f05 Render to string fix, display ETA message when student submits 2013-02-20 16:30:44 -05:00
Arthur Barrett
af2bfa9d4e Saving work in progress on v2 with capa template for annotation problem. 2013-02-20 16:30:19 -05:00
Chris Dodge
67f97c2c56 update Victor's metadata inheritance comment 2013-02-20 16:26:09 -05:00
Vik Paruchuri
2f29d85efc Finish function to get eta value 2013-02-20 16:22:22 -05:00
Chris Dodge
bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case 2013-02-20 16:20:39 -05:00
Vik Paruchuri
59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays 2013-02-20 16:19:17 -05:00
cahrens
dd959d1123 Longer warning got merged out. 2013-02-20 15:01:41 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Jay Zoldak
05f32f4bc9 Update tests for the advanced policy settings feature. 
Includes adding a method for css_click_at.
 2013-02-20 14:30:39 -05:00
Chris Dodge
da223d9e11 remove raise statement which was just needed for debugging 2013-02-20 14:13:19 -05:00
Chris Dodge
756959812f add some comments regarding which code can be removed when the 'split mongo module store' work is completed 2013-02-20 14:11:57 -05:00
Diana Huang
ea13659249 Merge branch 'master' into diana/click-tracking 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 14:02:04 -05:00
Diana Huang
a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test 2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b Clean up and fix some peer grading tests. 2013-02-20 13:36:09 -05:00
Vik Paruchuri
c3d485a609 Fix error message 2013-02-20 13:33:17 -05:00
Diana Huang
789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check 
Feature/vik/disable spell check
 2013-02-20 09:45:32 -08:00
Vik Paruchuri
dbe93502f1 Fix tests 2013-02-20 12:44:12 -05:00
Vik Paruchuri
2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed 2013-02-20 12:01:42 -05:00
Vik Paruchuri
c48998b30a Fix SA tests 2013-02-20 11:57:29 -05:00
Vik Paruchuri
7be76fe124 Fix tests 2013-02-20 11:54:57 -05:00
Diana Huang
13d4cfa4d4 Merge branch 'master' into diana/click-tracking 2013-02-20 11:40:14 -05:00
Vik Paruchuri
ee3c658f46 Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check 2013-02-20 11:39:39 -05:00
Arthur Barrett
610e210cc8 Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule 2013-02-20 11:32:46 -05:00
Arthur Barrett
33c12647cb Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-20 11:31:53 -05:00
Diana Huang
eefe87494d Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems 2013-02-20 11:23:28 -05:00
Diana Huang
d0bd7466b4 Fix import statement for TimeInfo 2013-02-20 11:22:58 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Diana Huang
03a4deb847 Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule 
Feature/vik/settings to xmodule
 2013-02-20 08:06:20 -08:00
Diana Huang
e467c057c9 Fix test so we don't have to skip it anymore. 2013-02-20 10:59:38 -05:00
Jay Zoldak
7495bd0ae4 Move terrain module from lms to common. 2013-02-20 09:52:32 -05:00
ichuang
fb70525417 dummy change to re-trigger jenkins 2013-02-19 19:50:36 -05:00
John Jarvis
fd36c555a6 Renaming login url for modal-less login 2013-02-19 19:36:32 -05:00
Brian Wilson
c234f3625e add full version of pdf.js, and main files for jquery-pdfdoc 2013-02-19 18:05:36 -05:00
Victor Shnayder
c1c050a6b6 WIP on an inputtype for heroesX annotation 
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
 2013-02-19 17:35:40 -05:00
John Jarvis
4596fa417f Changing login and signin view names 2013-02-19 17:31:22 -05:00
Jay Zoldak
9096914782 Move terrain module from lms to common. 2013-02-19 16:46:32 -05:00
Vik Paruchuri
2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 15:21:47 -05:00
Vik Paruchuri
72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	lms/templates/instructor/staff_grading.html
 2013-02-19 15:21:09 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
Arthur Barrett
34cc112cfb Saving work in progress on annotations v2 with classification problems. 2013-02-19 14:18:56 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00