Vik Paruchuri
|
9cbb4e090d
|
Swap icons for font awesome
|
2013-05-24 14:40:33 -04:00 |
|
Vik Paruchuri
|
5050eab74a
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-24 14:26:33 -04:00 |
|
cahrens
|
c95b44d851
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/envs/common.py
cms/templates/base.html
common/lib/xmodule/xmodule/combined_open_ended_module.py
|
2013-05-23 11:41:12 -04:00 |
|
David Baumgold
|
5746121f5c
|
Set up Notification and Prompt
|
2013-05-22 15:55:49 -04:00 |
|
David Baumgold
|
c0d69022cb
|
Set up Backbone model/view for alerts
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
88dd9244f3
|
removed symbolset, replaced with fontawesome for sock and static pages
|
2013-05-22 15:55:48 -04:00 |
|
Brian Talbot
|
2be2e2f20d
|
studio - plumbs in Font Awesome icons into header dropdown menus and user nav
|
2013-05-22 15:55:47 -04:00 |
|
Vik Paruchuri
|
fd6da08a97
|
Fix text
|
2013-05-21 00:26:39 -04:00 |
|
Vik Paruchuri
|
1f34561cff
|
Update examples, fix parsing error, avoid collision with capa template
|
2013-05-21 00:22:33 -04:00 |
|
Vik Paruchuri
|
ed2c1cf0d1
|
Remove header from cheatsheet
|
2013-05-20 11:46:01 -04:00 |
|
Vik Paruchuri
|
55fda26fd8
|
Fix tests, fix xqueue error, minor polish
|
2013-05-20 11:29:19 -04:00 |
|
Vik Paruchuri
|
d4b54ceca7
|
Update open ended editor to parse tasks properly
|
2013-05-20 10:49:04 -04:00 |
|
Vik Paruchuri
|
986999c62e
|
Fix cheatsheet, start working on xml replacement
|
2013-05-20 09:50:15 -04:00 |
|
Vik Paruchuri
|
9a7006473e
|
Do basic work on a simple editor for combinedopenended
|
2013-05-20 09:07:03 -04:00 |
|
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 |
|