2460 Commits

Author	SHA1	Message	Date
Steve Strassmann	6e34c668bb	introduce i18n	2013-04-17 11:30:29 -04:00
Christina Roberts	c455710cca	Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements ... Fix/cdodge/studio forum improvements	2013-04-11 10:37:49 -07:00
cahrens	40adfa950d	Get the "Edit High Level Source" link back in. Broken with xblock work. ... https://edx.lighthouseapp.com/projects/102637-studio/tickets/273	2013-04-10 14:53:26 -04:00
Brian Talbot	97e893b2ed	Merge branch 'master' into feature/btalbot/studio-courselink	2013-04-10 10:48:33 -04:00
Brian Talbot	01b2fefdd0	studio - revised course URL link label to match wording used elsewhere in the view/app	2013-04-10 10:48:12 -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
Brian Talbot	7882845786	studio - alerts: correcting page title	2013-04-08 17:09:43 -04:00
Brian Talbot	3f2e21f9dc	Merge branch 'master' into feature/btalbot/studio-alerts	2013-04-08 16:29:18 -04:00
Brian Talbot	3f22826e26	studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification	2013-04-08 16:28:31 -04:00
Brian Talbot	4e331a2c6a	studio - restyling course basic details and adding in a course's URL more prominently WIP	2013-04-08 15:39:01 -04:00
Mark L. Chang	1500586f70	Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo ... studio - corrected a typo and adjusted copy on the help sock	2013-04-08 11:23:16 -07:00
Brian Talbot	e3a1279c8f	studio - corrected a typo and adjusted copy on the help sock	2013-04-08 14:10:38 -04:00
Brian Talbot	aaf95ddbba	studio - course link: roughed in new markup/location of course link to share	2013-04-08 14:09:18 -04:00
Chris Dodge	472e657692	mark stumble on case where he had a None course	2013-04-08 14:07:37 -04:00
Brian Talbot	bcf4775610	studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling	2013-04-08 13:47:01 -04:00
cahrens	7f1c89b492	Merge branch 'master' into feature/btalbot/studio-alerts	2013-04-08 10:28:52 -04:00
Brian Talbot	a6c35fb2ce	studio - addressing pull request to merge to master feedback	2013-04-08 09:30:09 -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
Brian Talbot	f31588c81b	studio - resolving section release date form issues (labels, saving, updating)	2013-04-05 16:44:09 -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
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
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
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	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
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	1c7e13e1e8	copy change	2013-04-04 11:54:37 -04:00
Mark L. Chang	8fb6ce2eca	added tracking to unit page and components	2013-04-04 01:51:15 -04:00
Mark L. Chang	64b7603d37	outline page event tracking	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
Brian Talbot	d87c4e3866	resolving local merge with master	2013-04-03 15:01:55 -04:00
Chris Dodge	b640866748	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements ... Conflicts: common/lib/xmodule/xmodule/x_module.py	2013-04-03 14:05:59 -04:00
Don Mitchell	9a7324ebfa	Merge pull request #1798 from MITx/bug/christina/studio ... Fix due date bug.	2013-04-03 10:26:40 -07:00
Brian Talbot	65768e813b	resolving local merge conflict	2013-04-03 10:00:38 -04:00
Mark L. Chang	1d70509da1	fixed merge on env	2013-04-03 00:31:48 -04:00
Mark L. Chang	43f6f0ce8f	put survey behind MITX_FEATURES flag	2013-04-03 00:28:08 -04:00
Mark L. Chang	5df7f41c8f	added net promoter score tracking javascript shim from Qualaroo	2013-04-03 00:28:08 -04:00
Brian Talbot	6952b8e63b	studio - revising design, interaction, and FED of help sock	2013-04-02 15:37:49 -04:00
Brian Talbot	8b9ecd9367	studio - reverting footer UI to existing	2013-04-02 12:53:11 -04:00
Brian Talbot	6042f80703	studio - syncing up class naming conventions for icons	2013-04-02 09:02:59 -04:00
Brian Talbot	f07da92ab8	studio - adding in content/links to studio sock	2013-04-01 16:59:46 -04:00
Brian Talbot	769e209091	resolving local merge	2013-04-01 16:56:11 -04:00