12189 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark L. Chang	2e9bf4ac0e	Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics ... Conflicts: cms/envs/common.py	2013-04-04 16:11:22 -04:00
Mark L. Chang	10377bc41c	added a dummy key for segment.io so it doesn't ever fail	2013-04-04 16:08:10 -04:00
Calen Pennington	5873721e1b	Merge pull request #1800 from MITx/hotfix/stanford-press-release ... Stanford press release	2013-04-04 11:59:05 -07:00
Calen Pennington	99424a9716	Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error ... fix IntegrityError duplicate entry issue with module_data Scope.student_state update	2013-04-04 11:57:59 -07:00
Calen Pennington	e97e8ce5b6	Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup ... clean up xqueue callback url generation; allow override from settings	2013-04-04 11:54:13 -07:00
Diana Huang	d9d151b35e	Merge pull request #1768 from MITx/fix/diana/input-state-tests ... Tests to make sure that input_states have the correct keys	2013-04-04 11:39:34 -07:00
Calen Pennington	ff8dca943c	Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix ... fix lms migration to be compatible with xblock	2013-04-04 11:17:38 -07:00
Diana Huang	42614c69b4	Add space after comma.	2013-04-04 14:16:38 -04:00
Diana Huang	02b7ab4fa0	Tests to make sure that input_states have the correct keys ... and are not cross-pollinating	2013-04-04 13:47:55 -04:00
chrisndodge	79677e92ca	Merge pull request #1780 from MITx/feature/ichuang/staff-email-for-course-creation ... email link for course creation request (in Studio)	2013-04-04 10:40:51 -07:00
ichuang	2e852d16ac	Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation ... Conflicts: cms/envs/common.py	2013-04-04 17:34:52 +00:00
Calen Pennington	72ce1af982	Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands ... fix forum management commands (assign_default_role was moved)	2013-04-04 10:14:31 -07:00
Calen Pennington	7f19d48985	Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock ... Migrate to the open source XBlock repo	2013-04-04 10:12:00 -07:00
brianhw	b7c8a6977e	Merge pull request #1805 from MITx/fix/brian/user-on-progress ... add user name and email to progress page	2013-04-04 10:09:52 -07:00
chrisndodge	0ff31adf74	Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses ... sort course index in studio my courses page	2013-04-04 09:30:16 -07:00
Mark L. Chang	00abaffe1d	Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics	2013-04-04 12:17:58 -04:00
Mark L. Chang	db1c0bf081	added dev key so tests run	2013-04-04 12:14:34 -04:00
Brian Wilson	d3e7739b3b	add user name and email to progress page	2013-04-04 12:03:08 -04:00
Will Daly	1b7e552d5d	Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging ... add progress logging while running remove_input_state management command	2013-04-04 08:32:45 -07:00
Brian Wilson	4c511c3c66	add progress logging	2013-04-04 11:14:52 -04:00
Calen Pennington	039ccb83cc	Migrate to the open source XBlock repo	2013-04-04 10:55:31 -04:00
Diana Huang	8304e9031c	Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message ... Matlab Unit Tests and Minor Bugfix	2013-04-04 07:39:05 -07:00
Will Daly	fb14bedfdf	Merge pull request #1803 from MITx/fix/zoldak/pep8-psychometrics ... pep8 fixes for psychoanalyze and capa module	2013-04-04 07:26:13 -07:00
Jay Zoldak	22017ac24c	pep8 fixes for psychoanalyze and capa module	2013-04-04 09:57:19 -04:00
Piotr Mitros	1717782c5b	Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix ... fix psychometrics to be compatible with new xblocks	2013-04-04 05:50:59 -07:00
Mark L. Chang	1043958a73	Merge branch 'feature/markchang/studio-analytics' of github.com:MITx/mitx into feature/markchang/studio-analytics	2013-04-04 01:51:38 -04:00
Mark L. Chang	8fb6ce2eca	added tracking to unit page and components	2013-04-04 01:51:15 -04:00
Mark L. Chang	4ce34fa298	instrumented checklists	2013-04-04 01:51:15 -04:00
Mark L. Chang	7b5ec1bc41	instrumented advanced settings	2013-04-04 01:51:14 -04:00
Mark L. Chang	22bd8da1f2	added event tracking to static pages	2013-04-04 01:51:14 -04:00
Mark L. Chang	64b7603d37	outline page event tracking	2013-04-04 01:51:14 -04:00
Mark L. Chang	d9bbed305e	newline	2013-04-04 01:51:14 -04:00
Mark L. Chang	8439013f64	studio: added segment.io tracking	2013-04-04 01:51:14 -04:00
Mark L. Chang	587402cddc	added tracking to unit page and components	2013-04-04 01:47:37 -04:00
Mark L. Chang	405b18618c	instrumented checklists	2013-04-04 00:49:09 -04:00
Mark L. Chang	bab42b1cce	instrumented advanced settings	2013-04-04 00:40:06 -04:00
Mark L. Chang	c6f8b32dd4	added event tracking to static pages	2013-04-04 00:34:37 -04:00
Mark L. Chang	1ce2affdd2	outline page event tracking	2013-04-03 23:45:05 -04:00
Mark L. Chang	2e48212715	newline	2013-04-03 22:21:18 -04:00
Mark L. Chang	4265f5b48f	studio: added segment.io tracking	2013-04-03 22:07:23 -04:00
John Jarvis	d2313d851a	renaming image	2013-04-03 16:02:41 -04:00
John Jarvis	b2e8780f9b	adding a smaller stanford image	2013-04-03 16:01:15 -04:00
John Jarvis	e8ee6616c4	removing old logo	2013-04-03 15:39:46 -04:00
John Jarvis	6d78425a82	dding stanford-univ logo	2013-04-03 15:39:22 -04:00
John Jarvis	1c581835f2	changing stanford logo	2013-04-03 15:39:11 -04:00
Christina Roberts	56d5f13b5e	Merge pull request #1801 from MITx/fix/btalbot/studio-outlinedates ... Resolving display issues around outline release dates	2013-04-03 12:38:51 -07:00
John Jarvis	71cfc4441b	university->logo	2013-04-03 15:37:12 -04:00
John Jarvis	0c81329fa5	updating image link	2013-04-03 15:35:50 -04:00
Brian Talbot	b0021e7346	studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions	2013-04-03 15:35:22 -04:00
John Jarvis	7b226c34f8	Adding new logo for stanford	2013-04-03 15:34:54 -04:00