Ernie Park
|
0c83d18761
|
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
|
2012-02-13 14:55:28 -05:00 |
|
Ernie Park
|
8b5d56ff2f
|
merge
--HG--
branch : templates-ernie-html5-buttontoggle
|
2012-02-10 12:10:12 -05:00 |
|
Ernie Park
|
bb7d1615b5
|
put video control toggle into a function
--HG--
branch : templates-ernie-html5-buttontoggle
|
2012-02-10 12:10:01 -05:00 |
|
Kyle Fiedler
|
3bab1336f2
|
merge heads
|
2012-02-10 11:19:55 -05:00 |
|
Kyle Fiedler
|
6779e9b45e
|
Added screen fix for smaller screens on secondary pages
|
2012-02-10 11:19:41 -05:00 |
|
David Ormsbee
|
2359de96eb
|
Replace hardcoded url in password reset notification email with site name (from django_site table)
|
2012-02-10 11:15:18 -05:00 |
|
Kyle Fiedler
|
3c7dc27259
|
Fixed probelms with layout of three new pages and made small chages requested by Anant
|
2012-02-10 11:02:50 -05:00 |
|
Piotr Mitros
|
ad2989f4a6
|
Fixed unescaped unicode characters
|
2012-02-09 21:24:21 -05:00 |
|
Piotr Mitros
|
bb91ab2a54
|
More minor word tweaks
|
2012-02-09 21:06:37 -05:00 |
|
Piotr Mitros
|
e844c63171
|
Minor tweaks to e-mail templates
|
2012-02-09 20:55:38 -05:00 |
|
Kyle Fiedler
|
5881c84c47
|
Added links to the mitx page
|
2012-02-09 18:09:37 -05:00 |
|
Kyle Fiedler
|
372a987577
|
Added anats static pages
|
2012-02-09 18:04:56 -05:00 |
|
Kyle Fiedler
|
96176090d3
|
Merge
|
2012-02-09 18:03:22 -05:00 |
|
Kyle Fiedler
|
a3dbdb9512
|
Added anats static pages
|
2012-02-09 18:03:06 -05:00 |
|
Reda Lemeden
|
343225a355
|
Merge with Head
|
2012-02-09 15:56:56 -05:00 |
|
Reda Lemeden
|
254e806ac5
|
Fixed the footer and the sidebar
|
2012-02-09 15:56:21 -05:00 |
|
Kyle Fiedler
|
b605dfc3b5
|
Flashes error message for all forms on sign up
|
2012-02-09 15:51:04 -05:00 |
|
Kyle Fiedler
|
930963f667
|
Merged heads
|
2012-02-09 15:20:54 -05:00 |
|
Bridger Maxwell
|
4e2ac787e0
|
Changed instructions for wikipath extension
|
2012-02-09 15:18:38 -05:00 |
|
Ernie Park
|
4c3933a72c
|
merge default in
--HG--
branch : templates-ernie-video-spacebar
|
2012-02-09 15:10:30 -05:00 |
|
Ernie Park
|
e4b1e0588f
|
enable space bar to pause video
--HG--
branch : templates-ernie-video-spacebar
|
2012-02-09 15:06:32 -05:00 |
|
Kyle Fiedler
|
70e273db20
|
Added some more style for course info and profile pages
|
2012-02-09 15:06:08 -05:00 |
|
Kyle Fiedler
|
8b6188b9bf
|
merged in login errors branch
|
2012-02-09 12:28:02 -05:00 |
|
Kyle Fiedler
|
261c9b1551
|
Added link to create a new account on login modal and added styles for that too
--HG--
branch : kf-login-errors
|
2012-02-09 12:27:06 -05:00 |
|
Kyle Fiedler
|
bd523c2e9a
|
Merged in with default
--HG--
branch : kf-login-errors
|
2012-02-09 12:07:17 -05:00 |
|
Kyle Fiedler
|
aeb5357e0e
|
added more style to enroll buttons
--HG--
branch : kf-login-errors
|
2012-02-09 12:06:52 -05:00 |
|
Kyle Fiedler
|
feb383fd7b
|
Merge heads
|
2012-02-09 11:10:21 -05:00 |
|
Kyle Fiedler
|
28d3275724
|
Refactored html for calc and restyled
|
2012-02-09 11:09:59 -05:00 |
|
Bridger Maxwell
|
0585fd43fe
|
Changed editing instruction to not have wiki: shortcut, as that is incompatible right now.
|
2012-02-08 22:21:33 -05:00 |
|
Bridger Maxwell
|
acab3d2ee9
|
Changed article creation to *not* create child articles
|
2012-02-08 18:41:48 -05:00 |
|
Kyle Fiedler
|
78b198e359
|
Close templates_ernie_leanmodal_closebox
--HG--
extra : close : 1
|
2012-02-08 16:49:14 -05:00 |
|
Kyle Fiedler
|
63eeea6983
|
Merged in templates_ernie_leanmodal_closebox
|
2012-02-08 16:47:27 -05:00 |
|
Kyle Fiedler
|
30518d2f45
|
Merged with default
--HG--
branch : templates_ernie_leanmodal_closebox
|
2012-02-08 16:47:00 -05:00 |
|
Kyle Fiedler
|
42b9898572
|
Edited styles for the leanmodal x
--HG--
branch : templates_ernie_leanmodal_closebox
|
2012-02-08 16:46:41 -05:00 |
|
Reda Lemeden
|
7cb316e983
|
Merge with Head
|
2012-02-08 16:10:24 -05:00 |
|
Reda Lemeden
|
8b48c8b410
|
Added answer controls
|
2012-02-08 16:09:59 -05:00 |
|
Ernie Park
|
00e79f04d7
|
merge with default
--HG--
branch : templates_ernie_leanmodal_closebox
|
2012-02-08 15:51:32 -05:00 |
|
Ernie Park
|
a2f1928404
|
update leanmodal scss and add feedback for reset password in profile
--HG--
branch : templates_ernie_leanmodal_closebox
|
2012-02-08 15:49:10 -05:00 |
|
Piotr Mitros
|
e612572bad
|
MITX -> MITx
|
2012-02-08 14:39:22 -05:00 |
|
Reda Lemeden
|
e26a8059ce
|
Merge with head
|
2012-02-08 14:31:24 -05:00 |
|
Reda Lemeden
|
e34954f458
|
Redesigned the new question view
|
2012-02-08 14:30:55 -05:00 |
|
Kyle Fiedler
|
3636bb4755
|
merged with default
--HG--
branch : kf-login-errors
|
2012-02-08 13:54:42 -05:00 |
|
Kyle Fiedler
|
fd0023448f
|
Added new styles for errors and added flash to show the user resubmitted the form
--HG--
branch : kf-login-errors
|
2012-02-08 13:54:08 -05:00 |
|
Piotr Mitros
|
73388094c1
|
Merge
|
2012-02-08 13:01:43 -05:00 |
|
Piotr Mitros
|
c3598c6b95
|
Account already active is there
|
2012-02-08 13:01:13 -05:00 |
|
Reda Lemeden
|
a4b86d1766
|
Merge with head
|
2012-02-08 12:52:23 -05:00 |
|
Reda Lemeden
|
46e2cfcfd5
|
Centerred the comment upvote icon
|
2012-02-08 12:52:10 -05:00 |
|
Reda Lemeden
|
9312e71e68
|
Fixed the upvote class in the Javascript and the vote count rotation issue
|
2012-02-08 12:49:33 -05:00 |
|
Piotr Mitros
|
72720d19dd
|
Missing p tag
|
2012-02-08 11:54:10 -05:00 |
|
Piotr Mitros
|
b9700bf3e7
|
Merge
|
2012-02-08 11:50:29 -05:00 |
|