Commits · 0c83d18761cf20f8a67c582031cf3b2848cb88f3 · edx / edx-platform

13 Feb, 2012 1 commit

switch intro video to (experimental) iframe player so closing overlay stops… · 0c83d187

switch intro video to (experimental) iframe player so closing overlay stops video, and hitting play autoplays video. still buggy if clicked within 1 second of loading page

--HG--
branch : templates-ernie-global-intro-video

committed Feb 13, 2012

0c83d187 Browse Files

10 Feb, 2012 9 commits
- merge · 8b5d56ff
```
--HG--
branch : templates-ernie-html5-buttontoggle
```
  Ernie Park committed Feb 10, 2012
  8b5d56ff Browse Files
- put video control toggle into a function · bb7d1615
```
--HG--
branch : templates-ernie-html5-buttontoggle
```
  Ernie Park committed Feb 10, 2012
  bb7d1615 Browse Files
- merge heads · 3bab1336
  Kyle Fiedler committed Feb 10, 2012
  
  3bab1336 Browse Files
- Added screen fix for smaller screens on secondary pages · 6779e9b4
  Kyle Fiedler committed Feb 10, 2012
  
  6779e9b4 Browse Files
- Replace hardcoded url in password reset notification email with site name (from django_site table) · 2359de96
  David Ormsbee committed Feb 10, 2012
  
  2359de96 Browse Files
- Fixed probelms with layout of three new pages and made small chages requested by Anant · 3c7dc272
  Kyle Fiedler committed Feb 10, 2012
  
  3c7dc272 Browse Files
- Fixed unescaped unicode characters · ad2989f4
  Piotr Mitros committed Feb 09, 2012
  
  ad2989f4 Browse Files
- More minor word tweaks · bb91ab2a
  Piotr Mitros committed Feb 09, 2012
  
  bb91ab2a Browse Files
- Minor tweaks to e-mail templates · e844c631
  Piotr Mitros committed Feb 09, 2012
  
  e844c631 Browse Files
09 Feb, 2012 19 commits
- Added links to the mitx page · 5881c84c
  Kyle Fiedler committed Feb 09, 2012
  
  5881c84c Browse Files
- Added anats static pages · 372a9875
  Kyle Fiedler committed Feb 09, 2012
  
  372a9875 Browse Files
- Merge · 96176090
  Kyle Fiedler committed Feb 09, 2012
  
  96176090 Browse Files
- Added anats static pages · a3dbdb95
  Kyle Fiedler committed Feb 09, 2012
  
  a3dbdb95 Browse Files
- Merge with Head · 343225a3
  Reda Lemeden committed Feb 09, 2012
  
  343225a3 Browse Files
- Fixed the footer and the sidebar · 254e806a
  Reda Lemeden committed Feb 09, 2012
  
  254e806a Browse Files
- Flashes error message for all forms on sign up · b605dfc3
  Kyle Fiedler committed Feb 09, 2012
  
  b605dfc3 Browse Files
- Merged heads · 930963f6
  Kyle Fiedler committed Feb 09, 2012
  
  930963f6 Browse Files
- Changed instructions for wikipath extension · 4e2ac787
  Bridger Maxwell committed Feb 09, 2012
  
  4e2ac787 Browse Files
- merge default in · 4c3933a7
```
--HG--
branch : templates-ernie-video-spacebar
```
  Ernie Park committed Feb 09, 2012
  4c3933a7 Browse Files
- enable space bar to pause video · e4b1e058
```
--HG--
branch : templates-ernie-video-spacebar
```
  Ernie Park committed Feb 09, 2012
  e4b1e058 Browse Files
- Added some more style for course info and profile pages · 70e273db
  Kyle Fiedler committed Feb 09, 2012
  
  70e273db Browse Files
- merged in login errors branch · 8b6188b9
  Kyle Fiedler committed Feb 09, 2012
  
  8b6188b9 Browse Files
- Added link to create a new account on login modal and added styles for that too · 261c9b15
```
--HG--
branch : kf-login-errors
```
  Kyle Fiedler committed Feb 09, 2012
  261c9b15 Browse Files
- Merged in with default · bd523c2e
```
--HG--
branch : kf-login-errors
```
  Kyle Fiedler committed Feb 09, 2012
  bd523c2e Browse Files
- added more style to enroll buttons · aeb5357e
```
--HG--
branch : kf-login-errors
```
  Kyle Fiedler committed Feb 09, 2012
  aeb5357e Browse Files
- Merge heads · feb383fd
  Kyle Fiedler committed Feb 09, 2012
  
  feb383fd Browse Files
- Refactored html for calc and restyled · 28d32757
  Kyle Fiedler committed Feb 09, 2012
  
  28d32757 Browse Files
- Changed editing instruction to not have wiki: shortcut, as that is incompatible right now. · 0585fd43
  Bridger Maxwell committed Feb 08, 2012
  
  0585fd43 Browse Files
08 Feb, 2012 11 commits
- Changed article creation to *not* create child articles · acab3d2e
  Bridger Maxwell committed Feb 08, 2012
  
  acab3d2e Browse Files
- Close templates_ernie_leanmodal_closebox · 78b198e3
```
--HG--
extra : close : 1
```
  Kyle Fiedler committed Feb 08, 2012
  78b198e3 Browse Files
- Merged in templates_ernie_leanmodal_closebox · 63eeea69
  Kyle Fiedler committed Feb 08, 2012
  
  63eeea69 Browse Files
- Merged with default · 30518d2f
```
--HG--
branch : templates_ernie_leanmodal_closebox
```
  Kyle Fiedler committed Feb 08, 2012
  30518d2f Browse Files
- Edited styles for the leanmodal x · 42b98985
```
--HG--
branch : templates_ernie_leanmodal_closebox
```
  Kyle Fiedler committed Feb 08, 2012
  42b98985 Browse Files
- Merge with Head · 7cb316e9
  Reda Lemeden committed Feb 08, 2012
  
  7cb316e9 Browse Files
- Added answer controls · 8b48c8b4
  Reda Lemeden committed Feb 08, 2012
  
  8b48c8b4 Browse Files
- merge with default · 00e79f04
```
--HG--
branch : templates_ernie_leanmodal_closebox
```
  Ernie Park committed Feb 08, 2012
  00e79f04 Browse Files
- update leanmodal scss and add feedback for reset password in profile · a2f19284
```
--HG--
branch : templates_ernie_leanmodal_closebox
```
  Ernie Park committed Feb 08, 2012
  a2f19284 Browse Files
- MITX -> MITx · e612572b
  Piotr Mitros committed Feb 08, 2012
  
  e612572b Browse Files
- Merge with head · e26a8059
  Reda Lemeden committed Feb 08, 2012
  
  e26a8059 Browse Files