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

962 Commits

Author SHA1 Message Date
kimth
f0638f8a6f Merge pull request #677 from MITx/bug/kfiedler/tonys-bugs 
A bunch of solutions for bugs Tony had reported
 2012-09-13 08:36:37 -07:00
kimth
bee1c50d9f Merge pull request #678 from MITx/rocha/hotfixes 
Temporary fix to set the speed of video player to 1.0
 2012-09-13 08:29:35 -07:00
Carlos Andrés Rocha
9fb5346571 Temporary fix to set the speed of video player to 1.0 regardless of previous state 2012-09-13 11:26:52 -04:00
Kyle Fiedler
d107370b11 Made min width smaller for dynomath 2012-09-13 11:24:07 -04:00
Kyle Fiedler
5548e252c6 Hide list style for video elements 2012-09-13 11:24:07 -04:00
Kyle Fiedler
7812dd68fe Added more padding for detailed answer 2012-09-13 11:24:07 -04:00
kimth
7f67e9a060 Merge pull request #668 from MITx/bug/kfiedler/ie 
Fix IE bugs including schematic editor text alignment
 2012-09-13 08:20:11 -07:00
Calen Pennington
5450ddbde3 Merge pull request #674 from MITx/feature/victor/fix-colons-in-html 
Add more tests and replace ':' with '_' in html_id
 2012-09-13 07:30:46 -07:00
Victor Shnayder
0bbba8b16f Add more tests and replace ':' with '_' in html_id 
* in-progress to fixing support for ':' in url_names
 2012-09-13 09:44:51 -04:00
Carlos A. Rocha
67cbf50b83 Fix swfobject and django-pipeline - Cosmetic fix for youtube player 2012-09-13 01:08:59 -04:00
Carlos A. Rocha
df5e6d6860 Replace http with https for embedder youTube 2012-09-13 00:16:13 -04:00
Carlos A. Rocha
11d0c0d4b6 Remove video controls, use default youTube controls instead 2012-09-13 00:10:20 -04:00
Carlos A. Rocha
27fa9a38d8 Temporary fix for youTube iframe player issues 2012-09-12 23:56:05 -04:00
Kyle Fiedler
1dceff78b5 Fix alignment in tables for ie 2012-09-12 16:01:38 -04:00
David Ormsbee
53d0a6add8 Merge pull request #654 from MITx/feature/victor/fix-trailing-location-url 
make the test ajax_url format consistent with real code
 2012-09-12 12:19:53 -07:00
Kyle Fiedler
596d926eac Added fix so that sequnce nave doesn't go over full screen videos 2012-09-12 11:06:01 -04:00
Arjun Singh
bd5fc64462 make seeds consistent with other responsetypes 2012-09-11 18:08:27 -07:00
arjun810
b0e4bebc63 Merge pull request #661 from MITx/kimth/fix-firefox-cktsim 
Fix circuit simulator js for Firefox
 2012-09-11 16:15:55 -07:00
kimth
88e138bfaa Merge pull request #662 from MITx/feature/arjun/fix_seed 
Provide a reasonable seeding mechanism for jsresponses
 2012-09-11 16:15:14 -07:00
Arjun Singh
5e4a498cfe Provide a reasonable seeding mechanism for jsresponses 2012-09-11 15:09:49 -07:00
kimth
f35412f3f4 Don't bind update_schematics to global window.onload 2012-09-11 16:29:17 -04:00
ichuang
1f07bb0466 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/psychometrics 2012-09-10 22:03:08 -04:00
ichuang
56d44ec7f3 display_name may be empty (eg in tests) 2012-09-10 21:55:58 -04:00
ichuang
c6f794547f more tabs -> spaces 2012-09-10 21:45:38 -04:00
ichuang
d8c8c85041 tabs to spaces 2012-09-10 21:42:44 -04:00
ichuang
97a32e64ee fix tooltip titles in seq_module for non-new-xml-format courses 2012-09-10 21:33:54 -04:00
ichuang
e62e58dc6e log attempts in tracking 2012-09-10 20:33:56 -04:00
Victor Shnayder
9266bcca6d fix stupid bug in textbook handling code 2012-09-10 17:42:01 -04:00
Victor Shnayder
b501367ed3 make the test ajax_url format consistent with real code 
* specifically, no trailing slash
 2012-09-10 14:28:09 -04:00
Victor Shnayder
bff8cd4e4e don't break courseware if S3 is unreachable 2012-09-10 10:10:25 -04:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position 
Feature/victor/save course position
 2012-09-07 06:42:48 -07:00
David Ormsbee
e4c261ba37 Merge pull request #637 from MITx/kimth/cktsim-in-schematic 
cktsim-in-schematic
 2012-09-07 06:30:45 -07:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator 
Put in calculator in courseware
 2012-09-06 13:00:09 -07:00
Calen Pennington
8030fdce80 Fix test and assertion reversal in progress test 2012-09-06 15:47:45 -04:00
Calen Pennington
5f261ec335 Test that values are clamped between 0 and 100% for progresses 2012-09-06 15:47:12 -04:00
Calen Pennington
5ce516a3a0 Clamp progress to be greater than zero 2012-09-06 15:23:19 -04:00
Calen Pennington
14eb160eea Just return a null progress if something goes wrong when retrieving capa_module progress (and log the error) 2012-09-06 15:18:59 -04:00
Calen Pennington
897a87646c Make progress handle extra credit by capping at 100%, and handle malformed progress stuff by ignoring any changes 2012-09-06 15:16:24 -04:00
kimth
032869744b cktsim-in-schematic 2012-09-06 15:12:52 -04:00
Calen Pennington
34f2309c15 Merge pull request #631 from MITx/feature/victor/url_name-duplication 
fix for multiple url_name hashing bug
 2012-09-06 08:32:14 -07:00
Kyle Fiedler
3ab85d470a Fix before element 2012-09-06 10:39:19 -04:00
Kyle Fiedler
54f621a329 Added fix for pre as a first child in a list item 2012-09-06 10:21:34 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
Victor Shnayder
4481adb041 Track current chapter. 
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
 2012-09-05 16:15:53 -04:00
Victor Shnayder
6cfe52680b Fix XModule __unicode__ method 
- was referencing no-longer-present attributes
 2012-09-05 16:15:53 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00