4914 Commits

Author	SHA1	Message	Date
Jay Zoldak	86afe7279b	Refactor user factory usage for lettuce tests. Fix merge conflict.	2013-05-30 13:48:07 -04:00
Jay Zoldak	a1b62912f3	Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui	2013-05-30 12:33:15 -04:00
Jay Zoldak	4a64c0c9b6	Merge in from origin/feature/christina/metadata-ui	2013-05-30 12:33:02 -04:00
cahrens	14eb9c9a3b	Merge branch 'master' into feature/christina/metadata-ui	2013-05-30 12:27:03 -04:00
Jay Zoldak	6627ca5635	Tidy up the new lettuce tests for metadata editing a bit.	2013-05-30 12:26:18 -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
Ned Batchelder	956998496a	Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.	2013-05-29 16:08:54 -04:00
Ned Batchelder	0714b97511	Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.	2013-05-29 16:08:37 -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
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
Jane Manning	c976fee2d9	Copy changes to make dup email or public-username messages more informative	2013-05-28 15:32:53 -07:00
Will Daly	9f48c44fb6	Merge pull request #2120 from edx/feature/will/capa-template-tests ... Added tests for capa input templates (unescaped HTML)	2013-05-28 13:55:05 -07:00
James Tauber	d38f266153	updated mitxmako README to clarify license and origin	2013-05-28 15:14:47 -04:00
cahrens	625c6b518c	Cleanup, change how we load templates.	2013-05-28 14:07:35 -04:00
cahrens	f3d4381fde	Minor cleanup.	2013-05-28 12:53:00 -04:00
cahrens	2c32200cce	Updated text per Alex's e-mail.	2013-05-28 11:12:22 -04:00
Will Daly	dcb95291a9	Merge branch 'master' into feature/will/capa-template-tests	2013-05-28 08:07:54 -04:00
cahrens	6be9463eca	Cleanup.	2013-05-27 21:50:56 -04:00
cahrens	a195c4f55f	Continue merge.	2013-05-27 20:36:10 -04:00
cahrens	34082efad5	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/peer_grading_module.py common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml	2013-05-27 20:08:19 -04:00
cahrens	17c710af83	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/peer_grading_module.py common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml	2013-05-27 20:08:09 -04:00
Vik Paruchuri	e17276ade8	Fix some pep8 stuff	2013-05-24 16:43:29 -04:00
cahrens	87d904cb35	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: cms/templates/base.html	2013-05-24 16:10:34 -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