3751 Commits

Author	SHA1	Message	Date
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
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
Peter Baratta	ff3997e72e	Add test to verify a single period is not accepted as input	2013-05-31 12:37:14 -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
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
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
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
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
Ned Batchelder	c6dae2f17f	Merge pull request #2145 from edx/ned/codejail-slug ... Ned/codejail slug	2013-05-29 12:58:07 -07: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
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
Ned Batchelder	1d5f32d065	Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.	2013-05-29 14:24:43 -04:00
Chris Dodge	25dae57226	add the new category which can act as a category	2013-05-29 11:16:33 -04:00
Will Daly	dcb95291a9	Merge branch 'master' into feature/will/capa-template-tests	2013-05-28 08:07:54 -04:00
Vik Paruchuri	e17276ade8	Fix some pep8 stuff	2013-05-24 16:43:29 -04:00
Vik Paruchuri	9cbb4e090d	Swap icons for font awesome	2013-05-24 14:40:33 -04:00
Vik Paruchuri	5050eab74a	Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor	2013-05-24 14:26:33 -04:00
chrisndodge	27c6816bac	Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes ... randomize_module.py was missing 'import lxml' to support definition_to_x...	2013-05-24 06:26:23 -07:00
Valera Rozuvan	587ac0ecf0	Removed is_graded attribute. In HTML yaml it is not used, and that is not graded.	2013-05-24 10:14:18 +03:00
Valera Rozuvan	1e8c4e9edf	Rebase + updated videoalpha template. Now no data_dir attribute and is_graded set to false.	2013-05-24 10:14:18 +03:00
Valera Rozuvan	aaeb3a862d	Added Python tests for start_time and end_time parameters.	2013-05-24 10:14:18 +03:00
Lyla Fischer	56f60e06e4	changed 'from' and 'to' to 'start_time' and 'end_time'	2013-05-24 10:14:18 +03:00
Lyla Fischer	d68162f9fa	removed from and to labels	2013-05-24 10:14:18 +03:00
Lyla Fischer	c238f76fe8	different default section	2013-05-24 10:14:18 +03:00
Lyla Fischer	53f80d3991	standard video introduction	2013-05-24 10:14:18 +03:00
Valera Rozuvan	6794b73d99	Added videoalpha version 1 to the advanced components in studio.	2013-05-24 10:14:18 +03:00
Peter Baratta	2793bb4337	Add few more tests; fix a small bug with parallel resistors	2013-05-23 17:43:26 -04:00
Peter Baratta	2486f7c271	Fixed docstrings and other comments from PR review	2013-05-23 17:38:16 -04:00
Chris Dodge	b6090952da	randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool	2013-05-23 14:24:36 -04:00
Calen Pennington	69beea854c	Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports ... Record junit reports of jasmine tests	2013-05-23 11:06:34 -07:00
chrisndodge	a8084628e1	Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master ... Feature/cdodge/autoprovision forums master	2013-05-23 09:27:36 -07:00
Peter Baratta	1de8c4d321	Merge branch 'master' into pbaratta/calc-tests	2013-05-23 11:11:08 -04:00
Peter Baratta	70898a06da	Pep8 fix	2013-05-23 11:09:23 -04:00
Peter Baratta	db261dc1c3	Add docstrings; test divsion by zero at Response level	2013-05-23 10:18:30 -04:00
Calen Pennington	b2b6ca5f7b	Record junit reports of jasmine tests	2013-05-22 22:01:44 -04:00
Chris Dodge	3fceb46953	Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master	2013-05-22 20:44:22 -04:00
Vik Paruchuri	39663ce947	Add in newlines at end of files	2013-05-22 17:01:49 -04:00
David Baumgold	0a7222b123	Allow an AJAX call to specify that it should not notify on error ... Because there are some cases where it's OK to fail, and it's not the user's fault	2013-05-22 15:55:56 -04:00
Ned Batchelder	b9d134e3d1	Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions ... Check functions need access to course-local code also, so we need to sav...	2013-05-22 12:32:43 -07:00
Ned Batchelder	392de8d40e	Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function.	2013-05-22 13:27:24 -04:00
Chris Dodge	9b88528b04	Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master	2013-05-22 13:20:49 -04:00
VikParuchuri	f8e68216a7	Merge pull request #2096 from edx/fix/vik/oe-cache ... Fix/vik/oe cache	2013-05-22 09:59:33 -07:00
Vik Paruchuri	e5dd1a935c	Update rubric template	2013-05-22 12:49:49 -04:00
Vik Paruchuri	2303500ce2	Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor	2013-05-22 12:18:28 -04:00
e0d	e4c3f92372	Merge pull request #2100 from edx/hotfix/e0d/code-jail ... Sandbox-installed packages will be really installed instead of -e instal...	2013-05-22 09:05:03 -07:00