Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

42 Commits

Author SHA1 Message Date
Diana Huang
32524727ce Create a test framework and make it so that we force a mock backend 
when we don't have an ajax url
 2013-01-31 09:00:06 -05:00
Diana Huang
efc572c24d Fix navigation jasmine tests 2013-01-29 14:36:27 -05:00
Diana Huang
3f4c45468f Fix courseware jasmine tests 2013-01-29 11:36:10 -05:00
valera-rozuvan
233a35e01e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
37c7967e8c Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
213ca3fa32 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
fd0ec0ed8a Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
de63541049 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
d0c72ebe16 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8af93229d3 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7cf848db9e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8f120f1d27 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c94530cb01 Added initial RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	cms/djangoapps/contentstore/management/commands/import.py
	cms/djangoapps/contentstore/views.py
	cms/envs/common.py
	cms/envs/dev.py
	cms/envs/test.py
	cms/static/sass/README.txt
	cms/static/sass/_base.scss
	cms/static/sass/_calendar.scss
	cms/static/sass/base-style.scss
	cms/templates/base.html
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/module-dropdown.html
	cms/templates/widgets/navigation.html
	cms/templates/widgets/problem-edit.html
	cms/urls.py
	common/djangoapps/pipeline_mako/__init__.py
	common/djangoapps/util/views.py
	common/lib/capa/capa_problem.py
	common/lib/capa/templates/textinput_dynamath.html
	common/lib/mitxmako/middleware.py
	common/lib/mitxmako/shortcuts.py
	common/lib/mitxmako/template.py
	common/lib/xmodule/capa_module.py
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/test_files/symbolicresponse.xml
	common/lib/xmodule/test_files/test_files/symbolicresponse.xml
	common/lib/xmodule/tests/__init__.py
	common/lib/xmodule/tests/test_files/symbolicresponse.xml
	common/lib/xmodule/vertical_module.py
	common/lib/xmodule/video_module.py
	common/lib/xmodule/x_module.py
	lms/djangoapps/courseware/content_parser.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/static/coffee/spec/helper.coffee
	lms/static/coffee/spec/modules/video/video_player_spec.coffee
	lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
	lms/static/coffee/src/modules/problem.coffee
	lms/static/coffee/src/modules/sequence.coffee
	lms/static/coffee/src/modules/video/video_player.coffee
	lms/static/coffee/src/modules/video/video_volume_control.coffee
	lms/static/js/vendor/jquery-1.6.2.min.js
	lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
	lms/static/sass/application.scss
	lms/static/sass/courseware/_sequence-nav.scss
	lms/static/sass/courseware/_video.scss
	lms/templates/main.html
	lms/urls.py
	rakefile
	requirements.txt
 2012-07-05 16:22:50 -04:00
Prem Sichanugrist
cec1b23d7d Remove mystery guest from the test 2012-07-03 14:53:57 -04:00
Prem Sichanugrist
0815f3498a Cleanup Video Logger, update logging message 2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402 Fix failing tests after jQuery upgrade 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d Fix element naming convention 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1 Clean up events binding in Video Player 
* Video Player now acting as a parent that always knowing the state of
  their children.
* Events on the sub-controls are now triggered on itself, and binded by
  the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
  logic on scoped jQuery selector, render() and bind()
 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4580ef89d4 Queue up MathML conversion to be after render 
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4 Fix test failure after progress introduction 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00
Prem Sichanugrist
6facc631a2 Make sure we don't show volume control on iOS 2012-06-21 10:59:42 -04:00
Prem Sichanugrist
f2cc2fc54c Add video volume control to video player 2012-06-21 10:59:41 -04:00
Prem Sichanugrist
7159041947 Be specific on video progress slider handle 
Using `.ui-slider-handle` was too broad.
 2012-06-21 10:59:41 -04:00
Prem Sichanugrist
dd0c41cd15 Create Calculator and Feedback form on every page 2012-06-21 10:59:41 -04:00
Calen Pennington
40a950f152 Merge pull request #105 from MITx/ps-video-volume 
Add video volume control to video player
 2012-06-18 09:02:02 -07:00
Prem Sichanugrist
98ed738490 Make sure we don't show volume control on iOS 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
7924e5c8f5 Add video volume control to video player 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
e14563954a Be specific on video progress slider handle 
Using `.ui-slider-handle` was too broad.
 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
0f073f70c4 Create Calculator and Feedback form on every page 2012-06-13 14:56:48 -04:00
Prem Sichanugrist
b4ed14f4f7 Handle the case where histogram score can be null 
This will leave out the student that never attempt the question and
fixes the error with histogram rendering.
 2012-06-11 16:07:09 -04:00
Prem Sichanugrist
eb70ef4c07 Directly call toggleArrow in sequence render 
There might be a chance that an error got thrown after 'contentChanged'
event was fired and stop the `toggleArrow()` method to be called. This
will make sure that the navigation will still be working even some
element in the content is failed.
 2012-06-11 16:03:22 -04:00
Prem Sichanugrist
ac4f09ac4e Replace dynamite code with tested version 2012-06-08 11:16:03 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00