3823 Commits

Author	SHA1	Message	Date
Diana Huang	ff7b851f95	Merge pull request #4 from edx/diana/fix-error-descriptor ... Ensure that the original error gets preserved by the ErrorModule	2013-06-05 07:39:40 -07:00
Joe Blaylock	e092aadbf9	Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html ... Expose site-wide anonymized ids to HTML module	2013-06-04 14:13:59 -07:00
Diana Huang	d895c64f4a	Use full descriptor when showing errors, not just the model data.	2013-06-04 10:43:06 -04:00
Diana Huang	f3b36b8bc9	Use from_descriptor instead of from_xml to make ErrorDescriptor	2013-06-03 17:21:41 -04:00
Joe Blaylock	6262274805	Expose site-wide anonymized ids to HTML module ... Co-authored-by: Nate Hardison <natehardison@gmail.com>	2013-06-03 11:35:42 -07:00
Ned Batchelder	c865641f13	Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox ... Ned/move loncapa etc into sandbox	2013-06-03 11:27:16 -07:00
jkarni	4bc27b930c	Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred ... Add partial credit for foldit	2013-06-03 09:19:10 -07:00
Julian Arni	198d63db86	Update docstring for get_score	2013-06-03 12:13:05 -04:00
Julian Arni	c639bbc6f0	Add partial credit for foldit	2013-06-03 11:15:45 -04:00
Peter Fogg	8c5f9e6e41	Fix merge conflict.	2013-06-03 08:49:52 -04:00
Christina Roberts	52b76c87f4	Merge pull request #11 from edx/feature/christina/metadata-ui ... Feature/christina/metadata ui	2013-06-01 16:01:53 -07:00
Ned Batchelder	88d3f253b6	Move symmath to be its own directory, and install it into the sandbox.	2013-05-31 15:22:16 -04:00
VikParuchuri	4a997842c7	Merge pull request #2 from edx/fix/vik/single-step-oe ... Fix js that prevented single step OE problems (ie only self assessment) ...	2013-05-31 12:10:45 -07:00
Jay Zoldak	cd82bd054d	Merge pull request #20 from edx/zoldak/distribute-version ... require distribute >= because there is an old branch out there that messes up the build server	2013-05-31 12:09:17 -07:00
Ned Batchelder	98673f8e6a	Somehow, when I moved symmath, I left behind its test files!?	2013-05-31 14:39:23 -04:00
VikParuchuri	1c0bcf476a	Merge pull request #3 from edx/fix/vik/speed-up-oe-test ... Fix/vik/speed up oe test	2013-05-31 11:05:35 -07:00
Vik Paruchuri	badd3a8d13	Properly stub out the controller_qs variable in the tested module. Test times out without this.	2013-05-31 13:14:19 -04:00
Vik Paruchuri	9281a80089	Fix js that prevented single step OE problems (ie only self assessment) from working	2013-05-31 13:08:41 -04:00
marco	290d049c29	Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui	2013-05-31 12:41:13 -04:00
marco	72e1fab1c4	SASS variable and naming standards sync-up based on @talbs feedback completed	2013-05-31 12:40:40 -04:00
Peter Baratta	ff3997e72e	Add test to verify a single period is not accepted as input	2013-05-31 12:37:14 -04:00
Ned Batchelder	1bedc2e4bd	Change the file paths to be less specific.	2013-05-31 12:23:58 -04:00
Ned Batchelder	35a1dc123a	Wrap the lines so I can read the text.	2013-05-31 12:23:16 -04:00
Ned Batchelder	9314154ec1	Move loncapa grading helpers into the sandbox-packages directory.	2013-05-31 12:01:33 -04:00
cahrens	ab5834fb41	Pylint cleanup.	2013-05-31 11:26:19 -04:00
Jay Zoldak	a5ee903ef5	Pin capa to require distribute greater than 28 because an old branch had it at 30	2013-05-31 11:24:49 -04:00
Peter Baratta	087834337a	Pep8 newline	2013-05-31 11:05:21 -04:00
Peter Baratta	80a27f9391	Add test and functionality for trailing period	2013-05-31 10:41:08 -04:00
cahrens	e6dfa8e81c	Merge branch 'master' into feature/christina/metadata-ui	2013-05-31 09:46:17 -04:00
Peter Baratta	e17f9f6c37	Merge pull request #2108 from edx/pbaratta/calc-tests ... Add some testing to calc.py prior to changes	2013-05-30 12:54:52 -07:00
cahrens	8fd15ce45d	Review feedback.	2013-05-30 14:13:10 -04:00
cahrens	14eb9c9a3b	Merge branch 'master' into feature/christina/metadata-ui	2013-05-30 12:27:03 -04:00
Diana Huang	5118b06ef2	Merge pull request #2147 from edx/diana/fix-error-descriptor ... Fix XML Error Module so that it no longer shows the data to non-staff.	2013-05-30 08:52:41 -07:00
Peter Fogg	6eeb12ad1c	Add Lettuce tests for autoplay in Studio.	2013-05-30 11:34:15 -04:00
chrisndodge	5eaa6aea23	Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections ... add the new category which can act as a category	2013-05-30 06:20:21 -07:00
cahrens	b2fe7f5c01	Update documentation (per Toddi).	2013-05-29 17:19:33 -04:00
Peter Fogg	5465bda5f3	Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.	2013-05-29 17:00:25 -04:00
cahrens	f0260757c5	Cleanup.	2013-05-29 16:50:22 -04:00
Diana Huang	910324fb49	Fix XML Error Module so that it no longer shows the data to non-staff.	2013-05-29 16:31:11 -04:00
cahrens	d7a1dda937	Update display name.	2013-05-29 16:23:31 -04:00
Peter Fogg	3bfe3de679	Do autoplay in lms, not in cms.	2013-05-29 16:07:43 -04:00
Peter Fogg	81d3aa1464	Use self.system.debug instead of self.system.course_id; this seems less hacky.	2013-05-29 16:00:43 -04:00
Ned Batchelder	c6dae2f17f	Merge pull request #2145 from edx/ned/codejail-slug ... Ned/codejail slug	2013-05-29 12:58:07 -07:00
cahrens	b77919a849	Remove unnecessary fields.	2013-05-29 15:53:30 -04:00
Peter Fogg	0332d22a02	Prevent autoplaying of videos in Studio.	2013-05-29 15:52:42 -04:00
cahrens	551a1c1516	pep8 and documentation cleanup.	2013-05-29 15:47:46 -04:00
Peter Fogg	e0d5118ca0	Add hidden HTML so that the video player knows whether or not we're in the LMS.	2013-05-29 15:45:36 -04:00
chrisndodge	42a55fafb2	Merge pull request #1714 from edx/feature/valera/videoalpha1_studio ... Added videoalpha version 1 to the advanced components in studio.	2013-05-29 12:01:18 -07:00
cahrens	e3bc5e6bef	Update for metadata changes.	2013-05-29 14:43:31 -04:00
Ned Batchelder	34911f68a7	Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.	2013-05-29 14:25:24 -04:00