4582 Commits

Author	SHA1	Message	Date
Diana Huang	2b80b358ed	Add in a test for the marketing_link function in mitxmako	2013-05-17 10:51:37 -04:00
Diana Huang	b6c0081064	Look for the existence of the links, not for ... the actual urls	2013-05-16 16:30:29 -04:00
Diana Huang	22cf0dfa97	Fix bug in lettuce tests where the unregister dialog wasn't ... getting closed fast enough.	2013-05-16 16:30:29 -04:00
Diana Huang	1c2175304e	Merge branch 'master' into drupal-new	2013-05-16 16:27:36 -04:00
Arthur Barrett	52e5fe223c	update annotator.js library and fix the annotator-adder button hover state in courseware.	2013-05-16 14:27:21 -04:00
Arthur Barrett	1fbe43a650	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-16 13:23:12 -04:00
Will Daly	1e1e6450df	Pep8 fixes	2013-05-16 11:33:50 -04:00
Will Daly	342b3bb0e9	Merge branch 'master' into feature/will/ci-lettuce-tests ... Resolved conflict with changes to Rakefile in master Conflicts: rakefile	2013-05-16 11:21:59 -04:00
Calen Pennington	ec7c47828f	Merge pull request #1961 from edx/feature/cale/maintain-dev-environment ... Feature/cale/maintain dev environment	2013-05-15 12:36:36 -07:00
Calen Pennington	52d209d053	Use coffee installed in local node_modules for tests	2013-05-15 15:25:41 -04:00
Calen Pennington	964c21ff2b	Add a jasmine test runner for capa	2013-05-15 15:23:56 -04:00
Calen Pennington	ef17e9368c	Make capa specify distribute 0.6.28 like the rest of the project	2013-05-15 15:23:56 -04:00
Calen Pennington	14bf719538	Merge pull request #2019 from edx/fix/cale/xmodule-template-docs ... Add documentation of xmodule template files	2013-05-15 12:20:10 -07:00
Will Daly	1240c5ae92	Merge branch 'master' into feature/will/ci-lettuce-tests	2013-05-15 11:40:54 -04:00
Arthur Barrett	3a178bab1f	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-15 11:12:42 -04:00
Will Daly	8e069c1faa	Skip tests that break on Ubuntu due to alerts (which will be removed ... soon anyway). Removed @skip-phantom and @skip-firefox tags Fixed sign up test to work in Ubuntu Added comments	2013-05-15 09:39:07 -04:00
Will Daly	ee5f0ac0ce	Workaround for Ubuntu ChromeDriver issue. Now retries ... until it acquires a valid session.	2013-05-15 08:24:27 -04:00
Vasyl Nakvasiuk	b02e92a80c	fix word cloud test	2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk	0eb1b97ffc	add more docs	2013-05-15 11:42:43 +03:00
Vasyl Nakvasiuk	0afe6c11ab	word cloud: fix pylint warnings, use MetadataOnlyEditingDescriptor instead of RawDescriptor	2013-05-15 11:42:43 +03:00
Brian Talbot	26b149e742	Merge pull request #1997 from edx/fix/btalbot/studio-FEDcleanup ... Studio Front End Development Clean-up	2013-05-14 14:22:41 -07:00
Brian Talbot	8b77111d58	Studio: more styling changes ... typography, SASS, imports	2013-05-14 17:16:53 -04:00
Carlos Andrés Rocha	9a671f12d7	Fix import con resposetype when importing xqueue_interface	2013-05-14 17:15:46 -04:00
Brian Talbot	f069c1a1a1	Studio: style reorg ... typography, SASS import, mixins/extends	2013-05-14 17:15:07 -04:00
Will Daly	9dbcf0baa4	Updated login session handling to fix issue with ChromeDriver on Ubuntu	2013-05-14 14:47:50 -04:00
Arthur Barrett	0e7573a2cc	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-14 13:45:17 -04:00
Greg Price	2c1b0c831f	Merge pull request #2032 from edx/fix/gprice/zendesk-log-error ... Add a prefix string to Zendesk errors to be more searchable in Splunk	2013-05-14 09:35:33 -07:00
Arthur Barrett	5e39971fcc	merge master. resolved conflicts in component.py and course.py.	2013-05-14 10:54:21 -04:00
Calen Pennington	799ad92ecd	Add documentation of xmodule template files	2013-05-14 09:37:13 -04:00
Greg Price	a5bb31792b	Add a prefix string to Zendesk errors to be more searchable in Splunk	2013-05-13 16:38:52 -04:00
Victor Shnayder	4f2c3b78da	fix order of operations to make things rotate correctly	2013-05-13 16:27:27 -04:00
Arthur Barrett	bea943d537	merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.	2013-05-13 16:26:28 -04:00
Will Daly	2e0b5b24d8	Pylint and pep8 fixes	2013-05-13 15:21:45 -04:00
Peter Baratta	554d342f4e	Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug ... Fix infinity bug for numericalresponse; add tests	2013-05-13 11:08:54 -07:00
Will Daly	d1e35b14bb	Merge branch 'master' into feature/will/ci-lettuce-tests	2013-05-13 14:08:06 -04:00
VikParuchuri	e122efc5a3	Merge pull request #1991 from edx/feature/vik/oe-tests ... Feature/vik/oe tests	2013-05-13 10:49:33 -07:00
Arthur Barrett	be98b5fa3e	merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)	2013-05-13 13:26:55 -04:00
Vik Paruchuri	451784dc92	Fix pep8 space issues	2013-05-13 12:59:18 -04:00
Vik Paruchuri	df07192a68	Querydict comment.	2013-05-13 12:42:30 -04:00
Peter Baratta	d80024472c	Pylint fixes	2013-05-13 12:40:32 -04:00
Vik Paruchuri	a5549fd7fb	Add in some assert statements	2013-05-13 12:25:23 -04:00
Peter Baratta	06efd40ba9	Comment capitalization	2013-05-13 11:29:46 -04:00
Chris Dodge	d32e7a5b61	Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting	2013-05-13 11:06:49 -04:00
Valera Rozuvan	c56d1b5e78	Checked JS files with linter, corrected a few minor issues.	2013-05-13 17:37:14 +03:00
Peter Baratta	2b9d78dfd5	Pep8 fixes and changes to NaN tests	2013-05-13 10:18:19 -04:00
Chris Dodge	3cf865a88f	added another unit test check point for export/import of classic textbooks	2013-05-13 10:16:18 -04:00
Calen Pennington	b78e044018	Move wordcloud template settings into metadata, and remove contents of definition (since no fields edited by studio authors have scope.settings)	2013-05-13 09:05:05 -04:00
Valera Rozuvan	1353ae3ec2	Added license information to d3 JS file and to the word cloud layout.	2013-05-13 14:44:10 +03:00
Vasyl Nakvasiuk	4138c47128	merge all word_cloud Xmodule fields to one WordCloudFields class	2013-05-13 14:44:10 +03:00
Alexander Kryklia	331e3551ce	removes unnecesary images	2013-05-13 14:44:10 +03:00