David Baumgold
90a9c386eb
Update jasmine-jquery to 1.5.1
2013-05-22 15:55:52 -04:00
David Baumgold
d10e644c6e
Added sinon.js to project
2013-05-22 15:55:52 -04:00
Kevin Chugh
ef3204da69
Merge pull request #2059 from edx/feature/zoldak/forum-testing
...
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Jay Zoldak
cc2cc469fe
more work on jasmine tests for forums
2013-05-16 10:56:57 -04:00
Arthur Barrett
dd583ce4f9
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-09 14:32:05 -04:00
David Baumgold
ec79ebd4a7
Updated Backbone.js and Underscore.js
...
Backbone 1.0.0, Underscore 1.4.4
2013-05-08 09:29:15 -04:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
Brian Talbot
ceb4c719f7
changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes
2013-04-04 17:38:14 -04:00
Arthur Barrett
d636f4fab0
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-25 19:04:58 -04:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Carlos Andrés Rocha
2ca303c95d
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
...
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Brian Wilson
8076c5b731
remove unneeded files (that break collectstatic)
2013-02-21 17:38:00 -05:00
Brian Wilson
1850528a99
add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files
2013-02-20 18:49:59 -05:00
Brian Wilson
c234f3625e
add full version of pdf.js, and main files for jquery-pdfdoc
2013-02-19 18:05:36 -05:00
cahrens
167d07037d
Merged, delete Ace.
2013-02-19 14:56:37 -05:00
cahrens
f91060d197
Merge branch 'master' into feature/cas/manual-policy
...
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
2013-02-19 13:27:35 -05:00
Brian Wilson
0d3b566dd8
finish piping URL through to pdf.js
2013-02-14 15:47:53 -05:00
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
