Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,094 Commits 1 Branch 0 Tags
ab2995fc8591402ccce87dc00a64af023c554a6f
Commit Graph

184 Commits

Author SHA1 Message Date
Calen Pennington
ab2995fc85 Remove compiled css files 2012-07-16 11:41:18 -04:00
Galen Frechette
94886643b0 gets app completly uptodate with prototype 2012-06-20 14:37:37 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00
Calen Pennington
bf032e6386 Merge pull request #67 from MITx/dogfood 
Dogfood
 2012-06-06 06:07:22 -07:00
Prem Sichanugrist
5991829723 Fix Jasmine test failure after bf76894f 
Sequence content does not double-escaped anymore, and eval() usage was
also removed from the sequence module.
 2012-06-05 16:47:46 -04:00
Calen Pennington
970f6af385 Merge pull request #70 from MITx/kf-minor-ui 
Kf minor ui
 2012-06-05 12:17:52 -07:00
Calen Pennington
8575ed439d Merge branch 'master' into dogfood 
Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html
 2012-06-05 14:38:49 -04:00
Prem Sichanugrist
c380bd82aa Fix subtitle scroll and hide subtitle transition 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
6f9870f75f Hide the caption first when on the iOS browser 
This prevent user from prematurely seeking the video.
 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3b0a1b7ee2 Fix test variable leakage 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3f7dc68828 Lazily build video slider when on iOS device 
This will fix the problem when user trying to click the seek button on
the iOS, as the video need to be started first before it can be
seekable.
 2012-06-04 15:30:56 -04:00
Kyle Fiedler
382dc62173 Added styles for non play button 2012-06-04 15:30:56 -04:00
Kyle Fiedler
a6852eefb8 Sprited vcr controlls and added default bg image 2012-06-04 15:30:55 -04:00
Prem Sichanugrist
fe849dedd9 Do not display play/pause button on iOS Device 
iOS devices has a restriction that user has to click on the video
element to initiate playback. By visually disable the button, user will
be forced to click on the video itself, and everything will be worked as
expected.

Fixes https://www.pivotaltracker.com/story/show/30334381
 2012-06-04 15:30:55 -04:00
ichuang
68a2e7c079 dynamic math display - fix sequence of mathjax timing (mathml now 
generated when Check is clicked)
 2012-06-02 17:08:53 -04:00
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
Calen Pennington
0cb316353d Merge pull request #79 from MITx/ps-fix-page-jumping 
Fix page jumping bug when click on the speeds list
 2012-06-01 12:46:56 -07:00
Calen Pennington
83b0c84e45 Merge pull request #78 from MITx/ps-fix-youtube-click 
Trigger a pause event when user click Youtube logo
 2012-06-01 12:46:23 -07:00
Kyle Fiedler
da0e2d5f5c Remove usless comment 2012-06-01 13:42:20 -04:00
Prem Sichanugrist
d7043ea27f Fix page jumping bug when click on the speeds list 2012-06-01 13:36:14 -04:00
Prem Sichanugrist
bb18c854f7 Trigger a pause event when user click Youtube logo 
This will make sure that the play button is in the paused state.

Fixes https://www.pivotaltracker.com/story/show/26236143
 2012-06-01 13:33:27 -04:00
Piotr Mitros
be1e308dc9 Cale's fix for eval/extra json encode 2012-06-01 12:56:20 -04:00
Prem Sichanugrist
d20147932e Fix problem with sequence navigation on iOS 
* Add `touch-based-device` class to the <body> when running on iOS.
* Do not show the tooltip if we're on the iOS.
 2012-06-01 12:06:31 -04:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix 
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
0baa6293b5 Fix some failing spec after sequence module change 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
6d83534863 Fix bug on flashing speed selector 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
89194892e6 Move CoffeeScripts to asset pipeline 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
60094a1772 Add test coverage for JavaScript 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
8a87a4ba8b Make staff problem histogram work again 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
fc4d4c8295 Fix section convention and code highlight 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
2bc68c0f25 Add path prefix to all AJAX requests 
This will handle the case where the site was deployed under a
path prefix.
 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
1abe15d4d9 Rewrite Problem module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
8e7bf4c182 Fix broken test case 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
823843cd2f Make sure video is working in sequence module 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
b0149541a3 Preserve window.postJSON for now 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
dfb05bbb01 Refactor and removed unused code 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
80c97c6592 Refactor module loading using class detection 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
8624927fc4 Rewritten video module 2012-05-31 13:24:23 -04:00
Kyle Fiedler
a7cace4da9 Added fix for closing the courseware sidebar 2012-05-30 16:00:17 -04:00
Kyle Fiedler
ff3d474d4d Added highlihgts to the inputs for problems made check / save buttons a little bigger and gave the next / prev buttons in the sequnce nav hovers 2012-05-30 14:40:07 -04:00
Kyle Fiedler
4b22520fb0 some minor touches for the ui making rounded courners work throughout the site and changing around the wiki help bar 2012-05-30 11:43:45 -04:00
ichuang
fdca527bf1 Merge branch 'dogfood' of github.com:MITx/mitx into dogfood 2012-05-29 17:08:27 -04:00
ichuang
5994ef4cdb green pointer image for imageinput 2012-05-29 17:08:12 -04:00
ichuang
b70aa31b15 add django admin interface files to static 2012-05-29 07:35:21 -04:00
ichuang
472ef4a88e add codemirror.css back ; it is in static/css for now, until pipeline/coffee fixed. 2012-05-26 22:37:47 -04:00
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/js/application.js
 2012-05-21 14:53:16 -04:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements 
This includes calculator open/close button, navigation, profile, and
book's table of content.
 2012-05-21 11:23:55 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00