Commit Graph

5713 Commits

Author SHA1 Message Date
David Ormsbee
47b1c809dd Merge pull request #686 from MITx/rocha/hotfixes
Reverting to original video player
2012-09-13 16:04:37 -07:00
Carlos Andrés Rocha
5ce16738fb Reverting to original video player 2012-09-13 18:38:48 -04:00
arjun810
1597bdf41c Merge pull request #685 from MITx/kimth/fix-widow-js
Kimth/fix widow js
2012-09-13 15:14:02 -07:00
kimth
a40e8eaefb Clean up widow prevention logic 2012-09-13 18:10:11 -04:00
kimth
5dbc0b7e7a Fix widow prevent logic 2012-09-13 18:02:46 -04:00
kimth
cf9130a811 Widow prevention should be active when there are actual words 2012-09-13 17:51:25 -04:00
kimth
3164af650d Merge pull request #684 from MITx/kimth/fix-widow-js
Fix widow js
2012-09-13 14:41:25 -07:00
kimth
a9b03483aa Fix widow js 2012-09-13 17:38:20 -04:00
arjun810
ffd9c03051 Merge pull request #683 from MITx/kimth/put-back-bullets-in-course-info
Bring back bullets in lists
2012-09-13 13:48:29 -07:00
kimth
81e01c8c72 Bring back bullets in lists 2012-09-13 16:46:19 -04:00
kimth
26158e78ea Merge pull request #682 from MITx/feature/kfiedler/updates
Update styles for the info updates
2012-09-13 12:45:43 -07:00
kimth
5b413aa5da Merge pull request #681 from MITx/bug/kfiedler/empty-subtitle
fixed empty space below accordion nav items that dont have a subtitle
2012-09-13 12:45:02 -07:00
Kyle Fiedler
e0e94ee1f1 A little more space for each list 2012-09-13 15:23:46 -04:00
Kyle Fiedler
15ffd7e01d Better styles for updates 2012-09-13 15:13:42 -04:00
David Ormsbee
889dc9959f Merge pull request #675 from MITx/feature/kfiedler/last-press-release
Added one last press release
2012-09-13 11:54:10 -07:00
David Ormsbee
4a4b4a5c56 Merge pull request #679 from MITx/feature/bridger/wiki_fixes
Feature/bridger/wiki fixes
2012-09-13 11:53:52 -07:00
Kyle Fiedler
c17a9b78f8 fixed empty space below accordion nav items that dont have a subtitle 2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8 Merge pull request #669 from MITx/feature/kfiedler/widows
Added widow fix for subtitles too
2012-09-13 09:40:03 -07:00
Bridger Maxwell
a3760d484d Added call to load schematics on wiki pages. 2012-09-13 12:38:28 -04:00
Kyle Fiedler
f253186e31 Added right style for label 2012-09-13 11:57:46 -04:00
Bridger Maxwell
b4142246fe Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html. 2012-09-13 11:39:32 -04:00
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
Kyle Fiedler
67547e2b09 Added one last press release 2012-09-13 10:19:45 -04: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
2b9268ad48 Added widow fix for subtitles too 2012-09-12 16:35:21 -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