9641 Commits

Author	SHA1	Message	Date
Chris Dodge	288620592a	get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish	2013-04-07 19:33:04 -04: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	7c48f9a5ed	add unit test to verify that the store updated signal actually fired. Also fix bug where cloning item doesn't update the inherited metadata caches	2013-04-06 10:43:40 -04:00
Brian Talbot	f31588c81b	studio - resolving section release date form issues (labels, saving, updating)	2013-04-05 16:44:09 -04:00
Brian Talbot	d41f5042a5	studio - resolving margin-top issue with views that don't have a masthead	2013-04-05 16:30:51 -04:00
Chris Dodge	a3de4ff625	add unit test to confirm 'id' generation	2013-04-05 15:59:01 -04:00
Chris Dodge	e717244611	remove discussion cache, which isn't used	2013-04-05 15:27:50 -04:00
Brian Talbot	1a68d516fb	resolving local merge with master	2013-04-05 15:27:08 -04:00
Brian Talbot	512e4fe3bd	resolving local merge with master and sprucing style and templates for merge with master	2013-04-05 15:13:21 -04:00
Christina Roberts	33d39a85a9	Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock ... Studio Help Sock	2013-04-05 11:37:57 -07:00
Chris Dodge	f84eaf01b8	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements	2013-04-05 13:20:02 -04:00
Chris Dodge	3d7f893259	Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision	2013-04-05 13:19:10 -04:00
Chris Dodge	5bbfe87005	fix various pop8/pylint violations. switch hasattr() to getattr()	2013-04-05 13:18:48 -04:00
Chris Dodge	dbf58c0d54	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules	2013-04-05 12:53:24 -04:00
chrisndodge	4c95294ba7	Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course ... pylint/pep8 fixes	2013-04-05 08:45:12 -07:00
Brian Talbot	275826d4ff	studio - resolving help sock PR comments	2013-04-05 11:29:46 -04:00
Brian Talbot	4e8f01b88c	studio - adjusted abbr cursor displays	2013-04-05 11:18:16 -04:00
Brian Talbot	7ff975e0b6	studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers	2013-04-05 11:06:34 -04:00
Chris Dodge	02dfa09c70	pylint/pep8 fixes	2013-04-05 10:53:18 -04:00
cahrens	fa31953924	Update tests for GMT, get Advanced Settings test to pass reliably.	2013-04-05 10:47:58 -04:00
chrisndodge	f467d93f97	Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course ... Feature/cdodge/integrity check mongo course	2013-04-05 06:52:42 -07:00
Chris Dodge	8e36197cc2	tweeks per Cale's feedback	2013-04-05 09:30:49 -04:00
cahrens	2ad3fce27a	Show UTC at end of string.	2013-04-05 09:13:17 -04:00
Mark L. Chang	2852256898	added dummy analytics object	2013-04-04 23:44:40 -04:00
Brian Talbot	c26593df5b	studio - added in labels and UTC reference for subsection release date UI	2013-04-04 18:27:19 -04:00
Brian Talbot	da6ac54d1a	studio - added in labels and UTC reference for section release date modal forms	2013-04-04 18:00:08 -04:00
Brian Talbot	52a2fc7114	changing timeFormat for settings views	2013-04-04 17:45:40 -04:00
cahrens	cc6baf9dd4	Show GMT time, 24-hour.	2013-04-04 17:12:09 -04:00
cahrens	49e0753ef5	Show GMT time, 24-hour.	2013-04-04 16:56:10 -04:00
Brian Talbot	5f316b58ec	Merge branch 'master' into feature/btalbot/studio-alerts	2013-04-04 16:55:57 -04:00
Brian Talbot	530f9a87bb	studio - minor design tweaks to alert/notification chrome	2013-04-04 16:53:16 -04:00
Brian Talbot	3c3a6e7503	studio - adding in view-based banners UI tweaks and removing global banner UI for now	2013-04-04 16:46:38 -04:00
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
Brian Talbot	9ab5710a2a	studio - removing unused footer-height variable	2013-04-04 15:32:42 -04:00
Brian Talbot	6d4966745e	Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into feature/btalbot/studio-helpsock	2013-04-04 15:27:53 -04:00
Brian Talbot	8e67f63eb6	studio - syncing up hover color of sock control with other buttons	2013-04-04 15:27:02 -04:00
Chris Dodge	73113eddc7	fix xml_attributes inspection	2013-04-04 13:38:30 -04: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
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	db1c0bf081	added dev key so tests run	2013-04-04 12:14:34 -04:00
Mark L. Chang	1c7e13e1e8	copy change	2013-04-04 11:54:37 -04:00
Chris Dodge	c0fc029b03	switch over the variable 'ms' to be 'store'	2013-04-04 10:33:30 -04:00
Chris Dodge	c7061a0262	add a command line utility to walk through the course and find common errors	2013-04-04 10:20:31 -04:00
Chris Dodge	ac01079502	add a command line utility to walk through the course and find common errors	2013-04-04 09:35:35 -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