Commit Graph

19654 Commits

Author SHA1 Message Date
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
Calen Pennington
725cbe14d1 Merge pull request #73 from MITx/create-dev-env
Create dev env
2012-06-01 12:47:22 -07: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
Calen Pennington
ff7068d81c Merge pull request #77 from MITx/ps-fix-courseware-nav-ios
Fix problem with sequence navigation on iOS
2012-06-01 12:45:28 -07:00
ichuang
41996faede changed another debug print to use logging (module_render) 2012-06-01 15:01:34 -04:00
ichuang
b1b08d2989 made "position" a generic parameter passed to all modules, from courseware.views.index 2012-06-01 14:34:26 -04:00
ichuang
2e2bf13e5c untabify lib/dogfood/check.py 2012-06-01 14:15:48 -04:00
ichuang
7fbc4d7f4f removed django.settings imports from modules/* ; changed debug prints
to use logging; added DEBUG attr to XModule class
2012-06-01 13:49:19 -04:00
ichuang
a42ea2ca39 removed debug "if false" line in module_render 2012-06-01 13:42:50 -04: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
Calen Pennington
b574dcb8e8 Check for None with is rather than == 2012-06-01 12:18:43 -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
Calen Pennington
71e25d9b4b According to the elementtree spec, elements with no children test as false. We only want to skip checking for module ids if the module is actually not found 2012-06-01 12:02:40 -04:00
Piotr Mitros
7567e5ebf9 Working snapshot. Simple get_children. get_module taken out of render_module. 2012-06-01 10:29:12 -04:00
Piotr Mitros
98d8f4b55b Unstable commit; syncing computers 2012-05-31 21:12:08 -04:00
John Jarvis
6c4a3cf618 updating for coffeescript 2012-05-31 14:54:38 -04:00
John Jarvis
178cdc877e removing mercurial from brew install list 2012-05-31 14:36:23 -04:00
John Jarvis
a385dc4d2e added install.txt, updated env script for better error handling 2012-05-31 14:34:50 -04:00
Piotr Mitros
97c6a26c2b Merge master 2012-05-31 13:47:50 -04:00
Piotr Mitros
34dc32e5aa Unstable state; need to merge from master 2012-05-31 13:44:45 -04:00
pmitros
585e4c8d52 Merge pull request #68 from MITx/enable-enrollment
Add enrollment link back to main page for development purposes, until we...
2012-05-31 10:43:21 -07:00
Calen Pennington
6eb2914043 Merge pull request #40 from MITx/courseware_module
Courseware module rewrite
2012-05-31 10:32:22 -07: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
b1daa59cea Refactor video caption to use binary search 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
4298c920b8 Make show answer button toggleable 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
5eac6ffa1d Refactor Problem from changes upstream 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
80ba9bd0ff Remove unused init_js and destroy_js 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
d393a503e6 Remove unused JavaScript on the page bottom 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
afde79da33 Fix the broken caption select 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
e58674f220 Rebuild controls in JavaScript to reduce bandwidth 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
Prem Sichanugrist
0b26609846 Rewrite Sequence module to use unobtrusive JS 2012-05-31 13:24:23 -04:00