4416 Commits

Author	SHA1	Message	Date
Calen Pennington	d4df9eebac	Merge pull request #1866 from MITx/feature/cale/enable-rednose ... Enable test colors in nosetests	2013-04-17 10:15:25 -07:00
Calen Pennington	6c7c49e6bd	Fix pep8 violations	2013-04-17 11:07:58 -04:00
Calen Pennington	3cd414afbb	Merge pull request #1825 from MITx/fix/cale/gradebook ... Fix/cale/gradebook	2013-04-17 07:37:02 -07:00
Calen Pennington	904ec5d88b	Shorten long line	2013-04-17 10:05:43 -04:00
Calen Pennington	856b50531c	Remove errant copy of test_download_csv.py ... It was added to 2 different locations by mistake.	2013-04-17 10:04:40 -04:00
Calen Pennington	f252c62f31	Enable test colors in nosetests ... Use setup.cfg to set up default settings when running nose tests. Enable the rednose library to color test output.	2013-04-17 09:58:52 -04:00
brianhw	91d84c0208	Merge pull request #1863 from MITx/fix/brian/jobs-20130410 ... Update with 2013-04-10 changes	2013-04-16 12:56:58 -07:00
Brian Wilson	7f90e31709	Update with 2013-04-10 changes	2013-04-16 15:43:14 -04:00
Carlos Andrés Rocha	a947f620a0	Merge pull request #1861 from MITx/fix/btalbot/stanford-logo ... fixing the visual display of the stanford logo	2013-04-16 11:50:43 -07:00
Brian Talbot	b417651cf1	fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)	2013-04-16 14:47:26 -04:00
Vik Paruchuri	d82ac2b747	Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe	2013-04-16 13:45:46 -04:00
brianhw	976b71929d	Merge pull request #1845 from MITx/feature/brian/doc-html-text ... add documentation for HTML textbook	2013-04-16 10:15:49 -07:00
Vik Paruchuri	701bdc55c0	Minor fixes	2013-04-16 11:55:54 -04:00
Calen Pennington	9f3bad672a	Move the license test over to CourseFactory	2013-04-16 11:40:05 -04:00
Calen Pennington	d7796f4d47	Put test database into test_root	2013-04-16 11:40:04 -04:00
Calen Pennington	a06c1a4b57	Fix warnings to actually use correct format for string interpolation	2013-04-16 11:40:04 -04:00
Calen Pennington	5f4004c5ad	Clean up whitespace	2013-04-16 11:40:04 -04:00
Calen Pennington	6644b78819	Fix gradebook when using grade cutoffs other than A/B/C	2013-04-16 11:38:58 -04:00
Vik Paruchuri	0d4b9d26cf	Add in a test, rescale preview images	2013-04-16 10:51:23 -04:00
Vik Paruchuri	9acc592279	Comments for hotkeys	2013-04-16 10:23:08 -04:00
Brian Wilson	2d9deaf38c	remove code for supporting anchor_id on html textbooks, since it doesn't work	2013-04-12 11:53:06 -04:00
Jay Zoldak	d8c186d3a1	fix pylint errors in test_login.py	2013-04-12 10:25:12 -04:00
Jay Zoldak	1cc6a0a60d	Fix pylint errors	2013-04-11 17:20:38 -04:00
Jay Zoldak	bb1134b8ee	Convert login tests to use factories	2013-04-11 16:54:16 -04:00
Brian Wilson	123cfa333f	add documentation for HTML textbook	2013-04-11 16:42:14 -04:00
Jay Zoldak	88852c4b26	pep8 and pylint cleanup of new files	2013-04-11 14:11:30 -04:00
Jay Zoldak	442141fa04	Create a mock comment service that will listen for HTTP requests on a port	2013-04-11 14:08:32 -04:00
Chris Dodge	e0bc823365	remove auto-provisioning because of a dependency problem between cms and lms	2013-04-11 10:42:03 -04:00
Vik Paruchuri	9f04769c00	Better confirmation for flagging	2013-04-10 16:16:13 -04:00
Vik Paruchuri	a64d57ae1d	Add popup when flag box is checked	2013-04-10 16:01:56 -04:00
Vik Paruchuri	d0ecbbb4cf	Fix hotkeys in peer and staff grading to use ctrl prefix	2013-04-10 15:10:48 -04:00
Chris Dodge	07b9d6353e	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements	2013-04-10 09:26:51 -04:00
Vik Paruchuri	9cca3072c3	Fix skip behavior for staff	2013-04-09 13:53:51 -04:00
Ned Batchelder	d2ed6e2c02	Merge pull request #1830 from MITx/fix/cale/violations ... Clean up violations from ichuang's PR	2013-04-09 10:21:49 -07:00
Calen Pennington	5b8a410d12	Merge pull request #1829 from MITx/marketing/cale/delftx-header ... Marketing request: Lighthouse [#338, fixed]	2013-04-09 10:14:19 -07:00
Calen Pennington	63b5153cde	Clean up violations from ichuang's PR	2013-04-08 15:08:23 -04:00
Diana Huang	e981226d8d	Merge pull request #1823 from MITx/diana/job-page-update ... Make requested updates to the jobs page	2013-04-08 11:45:35 -07:00
Calen Pennington	8288202008	Marketing request: Lighthouse [#338, fixed]	2013-04-08 14:42:15 -04:00
Diana Huang	b1716dc2fa	Make requested updates to the jobs page	2013-04-08 13:10:04 -04:00
chrisndodge	146f09b788	Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change ... xblock changed attribute names from 'student' to 'user'. Need to update ...	2013-04-08 08:20:19 -07:00
chrisndodge	a57e0fa2c5	Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl ... make "edit" links work - fixes giturl (was broken by xblocks migration)	2013-04-08 08:17:31 -07:00
Chris Dodge	0949754cd4	xblock changed attribute names from 'student' to 'user'. Need to update consumers	2013-04-08 10:56:40 -04:00
chrisndodge	4b925520b8	Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix ... fix typo in instructor dashboard dump grading config	2013-04-08 07:28:22 -07:00
cahrens	f0d2ff7ba4	Change display_timezone to show_timezone.	2013-04-08 09:11:10 -04:00
cahrens	e4dac6e310	Add display_timezone so course authors can choose not to display timezones in LMS.	2013-04-08 08:38:52 -04:00
ichuang	8cafadc03b	make "edit" links work - fixes giturl (was broken by xblocks migration) ... Conflicts: lms/templates/staff_problem_info.html lms/xmodule_namespace.py	2013-04-07 00:03:36 +00:00
ichuang	51d882b7b0	fix typo in instructor dashboard dump grading config	2013-04-06 18:32:23 +00:00
Chris Dodge	5b7d882e3e	Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements	2013-04-06 11:02:21 -04:00
Chris Dodge	b78eed3c22	Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision	2013-04-06 10:58:26 -04:00
Chris Dodge	e717244611	remove discussion cache, which isn't used	2013-04-05 15:27:50 -04:00