cahrens
044a8a5cf6
CodeMirror.
2013-02-11 12:37:31 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
cahrens
d52be03446
Add ACE Editor (contents of src-min-noconflict).
...
last commit: 75ba742f4f00cefadfef1ae451cfb2a4280ad367
package 01.27.2013
2013-01-31 14:52:06 -05:00
cahrens
c956555da4
Note the codemirror version.
2013-01-31 14:50:21 -05:00
Don Mitchell
ba95cf2385
Auto expand on hover of drag&drop unit
2013-01-29 13:10:23 -05:00
Don Mitchell
e58193f87f
Updated comment
2013-01-25 13:03:54 -05:00
Don Mitchell
5ef3f3ee66
Update jquery ui. Overrode draggable w/ an in place fix for scroll
...
racing condition.
2013-01-25 12:44:58 -05:00
jmvt
549a5e9fe9
Merge remote-tracking branch 'origin/master' into jmpm-analytics
2013-01-23 12:02:48 -05:00
jmvt
bc268aa791
Merged to lastest master.
2013-01-17 17:39:12 -05:00
Brian Talbot
db7443ce7c
studio html editor - added in visual assets needed for previous UI syncing
2013-01-16 16:56:22 -05:00
cahrens
b58577a913
Version 3.5.8 of tinyMCE. http://www.tinymce.com/
2013-01-14 15:41:12 -05:00
cahrens
6312022b6e
Delete old version of tiny_mce.
2013-01-14 15:41:12 -05:00
cahrens
3cc63f1b2f
tiny_mce
2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a
Work in progress, related to rich HTML editor.
2013-01-14 15:41:12 -05:00
jmvt
d230c1b03c
Added example of geographic student distribution over world map.
2013-01-11 17:14:29 -05:00
Don Mitchell
04582f4e7c
Update timepicker b/c it wasn't handling minutes from 01-09 and they'd
...
fixed it
2013-01-10 11:05:14 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
valera-rozuvan
62271fe5c6
Added namespaced RequireJS.
2013-01-03 10:14:06 +02:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
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
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
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
Chris Dodge
a12baec599
add new files
2012-10-12 20:55:16 -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
