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

5690 Commits

This Branch
This Branch
All Branches
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
5c76a1fbaf Added fix for sequence nav in vertical 2012-09-13 11:24:07 -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
David Ormsbee
16d27737df Merge pull request #673 from MITx/rocha/hotfixes 
Workaround for swfobject - pipeline problems
 2012-09-12 22:42:35 -07:00
Carlos A. Rocha
e0c7cef65f Workaround for swfobject - pipeline problems 2012-09-13 01:38:52 -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
da87af5351 Fix missplaced k 2012-09-12 16:37:41 -04:00
Kyle Fiedler
9837acd68f Remove ie sass from wiki 2012-09-12 16:01:39 -04:00
Kyle Fiedler
b6e03c60b6 Added back the ie fixes from before 2012-09-12 16:01:39 -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
Sarina
b6b9b15912 Make clear where to specify display_name in xml 2012-09-12 14:58:23 -03:00
Victor Shnayder
e47134bd10 turn off psychometrics in dev.py--the necessary migration is not present 2012-09-12 13:20:15 -04:00
kimth
87750f3140 Merge pull request #666 from MITx/bug/kfiedler/tutorial-list-bullets 
removed list bullets from tutorials
 2012-09-12 10:04:08 -07:00
Kyle Fiedler
ec9521a9f5 removed list bullets from tutorials 2012-09-12 13:01:10 -04:00
Kyle Fiedler
2f8a7d0744 Removes unused widowfix script 2012-09-12 12:37:19 -04:00
Tom Giannattasio
032610e801 Merge pull request #660 from MITx/feature/kfiedler/cms-edits 
Added fixes to some style and one Cale fix to get things working properl...
 2012-09-12 08:53:45 -07:00
Tom Giannattasio
ba52523d6d Merge pull request #657 from MITx/bug/kfiedler/histogram 
Removed display none for histogram
 2012-09-12 08:53:07 -07:00
Tom Giannattasio
40eba7f792 Merge pull request #664 from MITx/feature/kfiedler/pressrelease 
Add new press releases
 2012-09-12 08:52:49 -07:00
Tom Giannattasio
841cb9b504 Merge pull request #659 from MITx/feature/kfiedler/widows 
Remove widows in accordion header
 2012-09-12 08:52:32 -07:00
kimth
1f4384265f Merge pull request #658 from MITx/bug/kfiedler/info-title 
info-title margin fixed
 2012-09-12 08:29:04 -07:00
kimth
98ba1ef564 Merge pull request #665 from MITx/bug/kfiedler/sequnce-over-video 
Added fix so that sequnce nave doesn't go over full screen videos
 2012-09-12 08:26:00 -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
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Calen Pennington
cb66946175 Merge pull request #663 from MITx/feature/arjun/js_seeds 
make seeds consistent with other responsetypes
 2012-09-11 18:12:11 -07: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
pmitros
025eb4f64c Merge pull request #648 from MITx/feature/ichuang/psychometrics 
Interrim psychometrics with real-time IRT plots and histograms (see note)

Ike is committing to implement the SOA API which discussed in person, in which a separate djangoapp would receive the tracking logs from the LMS, and also be queried by the LMS to perform psychometrics analyses.  Initially this psychometrics djangoapp might share some tables like StudentModule with the LMS, but the plan would be to separate them when possible.  

Ike will implement this for edX by November.
 2012-09-11 15:16:07 -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
Kyle Fiedler
7a248f0154 Added fixes to some style and one Cale fix to get things working properly 2012-09-11 14:05:07 -04:00
Kyle Fiedler
4732e39cb4 info-title margin fixed 2012-09-11 12:09:42 -04:00
Kyle Fiedler
064b5e7932 Remove widows in accordion header 2012-09-11 11:25:54 -04:00
Kyle Fiedler
3fd640aef3 Removed display none for histogram 2012-09-11 10:22:03 -04:00
ichuang
bffd9ac38d center histogram bars; pep8 2012-09-10 22:28:37 -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