Valera Rozuvan
757f955c5e
Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course.
2013-01-21 15:53:44 +02: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
Chris Dodge
1d7baccb38
add info-icon.png
2013-01-04 11:41:16 -05:00
Chris Dodge
349fd89eb8
fix tests on merge
2013-01-04 10:32:31 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
valera-rozuvan
62271fe5c6
Added namespaced RequireJS.
2013-01-03 10:14:06 +02:00
chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08:00
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -05: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
Calen Pennington
3b2b8ad4fa
Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests
...
Capa Problem jasmine tests running independently
2012-11-16 13:35:19 -08: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
93cc17cf3b
Starting to generate jasmine tests for common/lib
2012-11-14 15:03:55 -05:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Carlos Andrés Rocha
e5b11a9c57
Add HD control to video player
2012-10-30 19:21:17 -04:00
Victor Shnayder
da56f190a2
putting vsepr static image files where vsepr js can find them. TODO: reogranize after proper input type static file storage is sorted out.
2012-10-26 21:41:22 -04: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
chrisndodge
750e70e842
Merge pull request #878 from MITx/feature/cale/edge-landing-page
...
Feature/cale/edge landing page
2012-10-12 08:01:46 -07:00
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -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
Calen Pennington
8ca10a8356
Separate unit page from vertical implementation for editing
2012-10-01 15:19:35 -04:00
Calen Pennington
b305c0bae2
Make drag/drop save content immediately in seqs and verticals
2012-10-01 15:17:41 -04:00
Calen Pennington
fd7223bd87
Make editing work, building towards drag/drop saving
2012-10-01 15:17:41 -04:00
Calen Pennington
ce3638538c
Make inline editing save to mongo and then update the preview
2012-10-01 15:17:41 -04:00
Calen Pennington
05b9e6cab2
Standardize more of css between lms and cms
2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5
Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms
2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb
Consolidate bourbon and link to it from both cms and lms
2012-10-01 15:17:40 -04:00
