5389 Commits

Author	SHA1	Message	Date
John Jarvis	209ea51c28	merging from master	2014-11-26 16:21:16 -05:00
John Jarvis	2f0f011a21	config refactor wip	2014-11-26 21:14:39 +00:00
zubair-arbi	9fd2b0013e	Merge pull request #6049 from Shrhawk/shr/bug/TNL-290-incorrect-message-duplicate-course ... Modify error message	2014-11-26 19:03:52 +05:00
Syed Hassan Raza	50ee031151	Modify error message	2014-11-26 11:18:50 +05:00
Muhammad Ammar	6317347d3d	Merge pull request #5983 from edx/ammar/tnl-827 ... Remove ability to add new ORA 1 problems to courses	2014-11-25 19:23:12 +05:00
Sarina Canelake	a883a9cdda	Merge pull request #5925 from stvstnfrd/pep8/continuation ... Fix continuation-related PEP8 issues	2014-11-25 09:03:40 -05:00
stv	b215d771b7	Fix PEP8: E128 continuation line under-indented ... for visual indent	2014-11-24 20:46:50 -05:00
stv	6763c5dd74	Fix PEP8: E126 continuation line over-indented ... for hanging indent	2014-11-24 20:46:44 -05:00
stv	aba9b3b96e	Fix PEP8: E124 closing bracket does not match ... visual indentation	2014-11-24 20:46:44 -05:00
stv	5a69feadeb	Fix PEP8: E123 closing bracket does not match ... indentation of opening bracket's line	2014-11-24 20:46:44 -05:00
muhammad-ammar	a493348cf0	Remove ability to add new ORA 1 problems to courses ... TNL-827	2014-11-24 11:31:59 +00:00
Renzo Lucioni	73dd6fe2c7	hotfix-2014-11-21	2014-11-21 12:11:44 -05:00
Don Mitchell	21608f340c	Error on import into split ... if import restores a deleted draft element which was never published PLAT_297	2014-11-20 12:03:17 -05:00
Renzo Lucioni	55922f896d	hotfix-2014-11-20	2014-11-20 12:00:19 -05:00
Adam Palay	624360d1d6	serve mathjax from mathjax's cdn (TNL-823)	2014-11-20 09:36:16 -05:00
polesye	b6d8291996	TNL-772: Fix course time settings.	2014-11-20 14:56:12 +02:00
Waheed Ahmed	2d46a79345	Updated open sans webfonts with latest. ... TNL-395	2014-11-18 12:18:12 +05:00
David Baumgold	559f1e194e	Merge pull request #5941 from edx/studio-images ... Moved Studio images from img/ directory to images/ directory	2014-11-14 10:33:26 -05:00
Ben Patterson	a19b97c61f	Don't use 'test' db for mysql since it's reserved. ... This db name is reserved and used by mysql installations. This can cause conflicts when trying to populate our own 'test' database on mysql.	2014-11-13 14:41:50 -05:00
David Baumgold	e00424a091	Moved Studio images from img/ directory to images/ directory ... OPEN-304	2014-11-12 17:19:23 -05:00
Greg Price	dec9e41d1b	Merge pull request #5853 from edx/gprice/fix-complementary ... Fix spelling of complementary role	2014-11-12 14:36:35 -05:00
Christina Roberts	24039fb813	Merge pull request #5881 from edx/christina/notification-requirejs ... Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer	2014-11-12 09:08:05 -05:00
stv	cb894cf35e	Fix PEP8: E261 at least two spaces before inline comment	2014-11-10 19:31:09 -08:00
stv	16afc89b9b	Fix PEP8: E241 multiple spaces after ','	2014-11-10 19:31:09 -08:00
stv	500499b678	Fix PEP8: E231 missing whitespace after '[:,]'	2014-11-10 19:31:05 -08:00
stv	00ae488960	Fix PEP8: E225 missing whitespace around operator	2014-11-10 19:30:18 -08:00
Carson Gee	d02747ff60	Merge pull request #5910 from mitocw/cg/git_export_error_output ... Correct unresolved ugettext_lazy error strings in git_export command	2014-11-10 16:33:51 -05:00
Carson Gee	3816ac2ab0	Correct unresolved ugettext_lazy error strings in git_export command	2014-11-10 15:23:08 -05:00
stv	5677b143db	Fix PEP8: W391 blank line at end of file	2014-11-10 11:00:18 -08:00
stv	fb9f324f2f	Fix PEP8: E303 too many blank lines	2014-11-10 11:00:14 -08:00
stv	cf9308144d	Fix PEP8: E302 expected 2 blank lines, found 1	2014-11-10 11:00:11 -08:00
cahrens	ddc0015cdf	Clarify types of Python values.	2014-11-10 13:42:11 -05:00
cahrens	99c4413bd0	Simply check for existing text and type.	2014-11-10 13:13:48 -05:00
cahrens	c550963fb9	Set up validation_messages so that it goes through the RequireJS optimizer.	2014-11-10 13:13:44 -05:00
Adam	9a6acf2dff	Merge pull request #5837 from edx/adam/sandbox ... change djfs settings not to throw an error when the app starts up	2014-11-07 13:49:53 -05:00
Mark Hoeber	831453c531	Merge pull request #5817 from edx/markhoeber-1138 ... Export Template Update with Caution	2014-11-07 09:39:03 -05:00
Mark Hoeber	5015aa5515	Export Template Update with Caution	2014-11-07 09:38:27 -05:00
Christina Roberts	fd587b976c	Merge pull request #5710 from edx/christina/general-component-errors ... Support validation messages for any xblock (on container page).	2014-11-06 16:47:49 -05:00
Brian Talbot	181715f200	Studio: revising xblock validation message list styling	2014-11-06 15:49:10 -05:00
Brian Talbot	31dce7671e	Studio: revising element-level xblock information styling	2014-11-06 15:49:10 -05:00
cahrens	08ce09bde7	Display validation messages for any xblock on the container page. ... TNL-683	2014-11-06 15:48:55 -05:00
David Baumgold	f0a37cf43a	Merge pull request #5841 from edx/cms-consistent-branding-image-names ... Rename Studio logo	2014-11-06 14:56:31 -05:00
Adam Palay	459e4696c0	change djfs settings not to throw an error when the app starts up	2014-11-06 13:56:33 -05:00
Don Mitchell	396a8aca07	Remove multi-threading test as unnecessary and flakey ... also fix other users of check_mongo_calls to use None if they don't care about sends PLAT-239	2014-11-06 13:22:48 -05:00
David Baumgold	cfaa9dd588	Rename Studio logo ... OPEN-301	2014-11-06 09:34:17 -05:00
Don Mitchell	fc83c299ca	Generalize assets to any block_type but using ... AssetKey and the metadata store PLAT-204	2014-11-05 16:01:50 -05:00
Greg Price	067e270a84	Fix spelling of complementary role	2014-11-05 15:48:51 -05:00
Muhammad Ammar	e8e7e78e09	Merge pull request #5655 from edx/ammar/unit-improvements ... Unit Test Improvements	2014-11-05 19:55:39 +05:00
Sarina Canelake	fece2b9dd2	Merge pull request #5821 from edx/sarina/remove-old-admin-files ... Remove admin files deprecated in Django 1.4	2014-11-04 10:55:13 -05:00
Sarina Canelake	bc20ccb332	Merge pull request #5828 from edx/sarina/moar-pep8 ... Remove more pep8 violations	2014-11-04 08:58:17 -05:00