Miles Steele
5d4a5fcdb0
add slickgrid assets
2013-08-02 09:52:12 -04:00
jmclaus
8c3f4388d6
video_speed_control passes all tests except 1
...
Mocked loading of captions.
Fixed remaining tests in captions.
Fixed failing tests in speed control, and quality control. Turned off all VideoAlpha tests because browser crashes when all are run at once. To check that they are passing, go through each file one by one, replacing xdescribe with describe. Dont forget to change back to xdescribe when the test was run and turns out to be OK.
Some tests at the end of video_player_spec.js pass
Further fixing tests in video_player_spec file.
transfers changes to test_logic from master to __init__ and other files
Fixing more tests.
2013-08-01 20:08:45 +03:00
David Baumgold
6c313339e1
Updated Backbone-Associations to v0.5.0
2013-07-09 19:16:05 -04:00
David Baumgold
3f0efe70cf
Added jasmine-stealth library, v0.0.12
2013-07-09 19:16:03 -04:00
David Baumgold
00f76f3cda
Added Backbone Associations v0.4.2
2013-07-09 19:16:01 -04:00
Renzo Lucioni
7c048fb243
Merge pull request #181 from edx/renzo/segment-io-sequentials
...
Instrument sequentials with segment-io
2013-06-19 08:07:37 -07:00
Renzo Lucioni
841ff4765f
Abridge tests in light of learning how Segment.io works
2013-06-18 17:58:10 -04:00
David Baumgold
aa24508024
Add underscore.string library
...
http://epeli.github.io/underscore.string/
2013-06-18 10:23:18 -04:00
cahrens
e6dfa8e81c
Merge branch 'master' into feature/christina/metadata-ui
2013-05-31 09:46:17 -04:00
David Baumgold
bdc9570cd1
Removed Symbolset font files
2013-05-30 16:09:17 -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
350c5460af
Revert "Update jasmine-jquery to 1.5.1"
...
This reverts commit 90a9c386eb
2013-05-22 17:29:52 -04:00
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
cahrens
4d7c7f866a
Merge branch 'master' into feature/christina/metadata-ui
2013-05-20 15:06:40 -04:00
marco
c0cff81e5e
styled firefox number buttons
2013-05-20 14:39:37 -04:00
marco
c356904027
css styles for firefox input number fields
2013-05-20 12:06:30 -04:00
marco
32f7691040
minor style changes for increment and decrement buttons on firefox number fields
2013-05-20 11:39:13 -04:00
cahrens
3229aaf503
Call polyfill at right time.
2013-05-20 11:16:20 -04:00
marco
aa41aed9d1
prototype for polyfill on number input fields, minimal styling to up down buttons
2013-05-20 09:45:33 -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
marco
ef14155306
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
2013-05-16 09:50:16 -04:00
marco
12dae84a07
commented out firefox polyfill ad well as xmodule css editor changes
2013-05-15 16:07:45 -04:00
marco
b3e41d19f6
styling for static pages updated
2013-05-15 13:29:35 -04:00
marco
0422350e8c
final changes to codemirror styling, and clean up style for settings button clearing
2013-05-15 12:05:43 -04:00
marco
e157173c11
styling adjustments to codemirror and wrapped polyfill into a function
2013-05-15 10:53:54 -04:00
marco
8d8c8d83df
updated unit styling, added polyfill js library, updated javascript handling for modes swap
2013-05-14 12:38:52 -04:00
marco
0aaaf84f62
added number metadata template, cleaned up editor theme ui bordering and settings styles
2013-05-14 08:22:36 -04:00
cahrens
5edbf3d8f7
Merge branch 'master' into feature/christina/metadata-ui
2013-05-13 10:55:32 -04:00
marco
97de97cc18
minimal mce editor style changes to borders
2013-05-13 09:27:13 -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
