Commit Graph

630 Commits

Author SHA1 Message Date
Chris Dodge
0be0889d9c in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro 2012-11-15 15:21:40 -05:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
2012-10-23 13:38:11 -04:00
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Chris Dodge
8ad26fc27e replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not. 2012-10-18 21:11:46 -04:00
chrisndodge
6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
improvements on asset upload refresh. Now we don't need to refresh the w...
2012-10-17 10:47:47 -07:00
Chris Dodge
82e77a26c6 add mustache.js to common static repo 2012-10-17 13:47:07 -04:00
Victor Shnayder
f4d8df94dd Make chem preview more robust
- give the preview div an id, use that to look it up instead of dancing around in the DOM
2012-10-14 11:35:32 -04:00
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -04:00
Victor Shnayder
db8639e06a Fix preview code
- I'm starting to vaguely understand js variable scope and closures.  Long way to go though :)
2012-10-12 22:52:41 -04:00
Chris Dodge
a12baec599 add new files 2012-10-12 20:55:16 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Tom Giannattasio
c3e2a544da tweaks to datepicker and calendar 2012-10-11 14:53:45 -04:00
Chris Dodge
0cf6a1179a wip - trigger display message when release data is different than parent release date 2012-10-08 10:43:46 -04:00
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
ichuang
b4a3591310 add jquery flot axislabels plugin 2012-09-08 23:21:13 -04:00
David Ormsbee
4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-22 20:18:36 -07:00
Bridger Maxwell
82ebc14bd6 Fixed inline circuit editing to only work if 'circuit-schematic' is at the beginning of a line. 2012-08-22 21:15:52 -04:00
Rocky Duan
a905ac9e1d updated backbone & single thread retrieval now working 2012-08-20 22:03:46 -07:00
Bridger Maxwell
55f3a971cf Wiki circuit editors zoom to fit contents. 2012-08-18 00:10:42 -04:00
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
2a84d147f0 Fixed a sizing bug in circuit editor. 2012-08-17 20:22:28 -04:00
Bridger Maxwell
d3962ecd92 Updated CodeMirror modes for better syntax highlighting. 2012-08-17 20:16:08 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Arjun Singh
26f31324c4 Moving a few static files out of lms into common 2012-08-07 13:39:59 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00