Kyle Fiedler
|
a4e57aeb47
|
Made changes to Anants three pages
|
2012-02-10 16:44:30 -05:00 |
|
Bridger Maxwell
|
a8c32923dc
|
Rotated the profile graph labels, so the all fit
--HG--
branch : bridger-dev
|
2012-02-10 15:57:57 -05:00 |
|
Bridger Maxwell
|
69343aaedd
|
Rotated the profile graph labels, so the all fit
--HG--
branch : bridger-dev
|
2012-02-10 15:57:39 -05:00 |
|
Piotr Mitros
|
dae8420456
|
Support for static pages added
|
2012-02-10 13:38:44 -05:00 |
|
Bridger Maxwell
|
59ff6ce7df
|
Added percentage label to course overview progress
--HG--
branch : bridger-dev
|
2012-02-10 12:35:42 -05:00 |
|
Piotr Mitros
|
c50cae3d93
|
Merge, minor correction to e-mail
|
2012-02-10 12:26:44 -05:00 |
|
Bridger Maxwell
|
1b6f058851
|
Added bar on progress graph to show overall grade.
--HG--
branch : bridger-dev
|
2012-02-10 12:18:08 -05:00 |
|
Bridger Maxwell
|
a7f2d96775
|
Added bar on progress graph to show overall grade.
--HG--
branch : bridger-dev
|
2012-02-10 12:17:49 -05:00 |
|
Ernie Park
|
f969faa0d4
|
merge css
--HG--
branch : static-ernie-html5-buttontoggle
|
2012-02-10 12:11: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 |
|
Ernie Park
|
e7b49d4a07
|
fix bug where HTML5 video player's play/pause button didn't update when you click the video
--HG--
branch : static-ernie-html5-buttontoggle
|
2012-02-10 12:09:43 -05:00 |
|
Kyle Fiedler
|
cc74e574db
|
Made secondary pages have no padding on smaller screens
|
2012-02-10 11:20:24 -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 |
|
Bridger Maxwell
|
b2c89cffff
|
Added documentation for wikipath
|
2012-02-09 15:22:46 -05:00 |
|
Kyle Fiedler
|
c64668ce14
|
new styles for course info page and profile page
|
2012-02-09 15:21:23 -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 |
|
Bridger Maxwell
|
012e51811a
|
Fixed wikipath extension
|
2012-02-09 15:18:19 -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 |
|
Bridger Maxwell
|
a8a01ce942
|
Cleaning up profile to output better lists
--HG--
branch : templates-profilecleanup
|
2012-02-09 14:55:40 -05:00 |
|
Bridger Maxwell
|
fd7f229ae1
|
Cleaning up profile to output better lists
--HG--
branch : mitx-profilecleanup
|
2012-02-09 14:55:20 -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
|
e012f18f43
|
Styled calc
|
2012-02-09 11:10:48 -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
|
ea39249566
|
Disabled wikipath markdown extension, as it requires markdown 2.1.0, and we are running 2.0.3
|
2012-02-08 22:20:46 -05:00 |
|
Bridger Maxwell
|
b1377f6c4e
|
Merge. Also, for last commit I added sorting to the wiki 'all articles' but forgot to put it into commit message.
|
2012-02-08 21:40:27 -05:00 |
|
Bridger Maxwell
|
159af57995
|
Removed codehilite from wiki. It was throwing errors and wasn't used. Should be fixed later?
|
2012-02-08 21:37:24 -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 |
|