Commit Graph

244 Commits

Author SHA1 Message Date
cahrens
b16e17a250 Some i18n work and other minor cleanup. 2013-05-17 14:57:25 -04:00
marco
ef14155306 cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill 2013-05-16 09:50:16 -04:00
marco
bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings 2013-05-15 16:27:04 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
cahrens
d35b29031f Clean up editable_metadata_fields. 2013-05-15 14:01:18 -04:00
marco
04bb7335e7 removed extra section heading in settings DOM, placed settings after editor 2013-05-10 13:18:43 -04:00
cahrens
4a7f7d6537 Update the other templates that include metadata-edit.html. 2013-05-09 14:34:52 -04:00
marco
cad8ae1b9b merged in new data requirements for html 2013-05-09 14:19:31 -04:00
cahrens
60f41eb108 Cleanup. 2013-05-09 11:49:09 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
cahrens
594d28a653 Pass default value through. 2013-05-06 16:03:41 -04:00
cahrens
c01410626f Jasmine test for changedMetadata method. 2013-05-02 13:39:20 -04:00
cahrens
46100fd258 Cleanup. 2013-05-02 12:32:32 -04:00
cahrens
93f10ae8a0 Only save changed metadata fields. 2013-05-02 11:41:38 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
cahrens
8705ff8805 Remove system_metadata_fields. 2013-04-29 16:41:07 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
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
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
e3a1279c8f studio - corrected a typo and adjusted copy on the help sock 2013-04-08 14:10:38 -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
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
Mark L. Chang
2852256898 added dummy analytics object 2013-04-04 23:44:40 -04:00
Mark L. Chang
1c7e13e1e8 copy change 2013-04-04 11:54:37 -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
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
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
Brian Talbot
6952b8e63b studio - revising design, interaction, and FED of help sock 2013-04-02 15:37:49 -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
57e5eb683b studio - basic design, interaction, and content for static in-page help 2013-04-01 16:54:56 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
2013-03-28 13:27:29 -04:00
Brian Talbot
c8ab45cc57 studio - footer help ui revamp - animation, structure, styling - WIP 2013-03-27 17:40:24 -04:00
Brian Talbot
756f75951d studio - in progress work on help UI 2013-03-27 16:28:49 -04:00
Brian Talbot
3a4bdf19fb studio - tweaking footer navigation for tender widget label 2013-03-27 12:26:49 -04:00
Brian Talbot
e3c646492c studio - made provide feedback conditional for logged in users 2013-03-27 01:39:24 -04:00
Brian Talbot
74439746cc studio - made provide feedback conditional for logged in users 2013-03-27 01:38:36 -04:00
Brian Talbot
6889b2015b studio - added in revised footer styles and fix for smoothscroll 2013-03-27 01:24:31 -04:00
Brian Talbot
8a4047d5dd studio - added smoothscroll to top of view and wired footer tender widget link 2013-03-26 12:48:51 -04:00
Brian Talbot
7c68508b85 studio - finalized tender widget styling 2013-03-26 12:42:30 -04:00
Brian Talbot
175e1b46e9 studio - in progress styling of tender help widget 2013-03-26 08:32:49 -04:00
Brian Talbot
66ba0f9b81 studio - resolving local merge with master 2013-03-25 15:21:25 -04:00
cahrens
be4045cb86 Reduce pep8 warnings, move Checklistst to top of menu. 2013-03-21 22:17:46 -04:00
cahrens
6d6e144c35 Urls working. 2013-03-20 16:37:08 -04:00