Commit Graph

267 Commits

Author SHA1 Message Date
Reda Lemeden
8c851d6fa8 Merge with head 2012-02-06 12:43:45 -05:00
Reda Lemeden
c74b5ef421 Re-designed the comment controls (edit, delete, upvote) 2012-02-06 12:42:25 -05:00
Ernie Park
15d339ba3e add document.location.protocol to src of html5 youtube video 2012-02-06 11:19:17 -05:00
Ernie Park
2ff504e881 try removing origin altogether from html5 video 2012-02-06 11:05:29 -05:00
Ernie Park
3450a81766 fix origin to add the protocol and // 2012-02-06 11:00:07 -05:00
Ernie Park
64ce159a3d merge 2012-02-05 23:49:39 -05:00
Ernie Park
87b84c3e63 make origin for html5 video flexible and use document.domain 2012-02-05 23:48:44 -05:00
Piotr Mitros
e193240ae4 title to name 2012-02-05 19:51:11 -05:00
Piotr Mitros
3a95cf8853 Revert Ernie's change 2012-02-05 18:27:27 -05:00
Piotr Mitros
0c39f337b0 Semantic title 2012-02-05 18:20:29 -05:00
Ernie Park
7a6656a560 update origin for staging to fix html5 video 2012-02-05 17:57:34 -05:00
Piotr Mitros
2ea682fc8b Public name is now username 2012-02-05 15:25:25 -05:00
cjt
3d3002d06a html content 2012-02-05 14:48:17 -05:00
Piotr Mitros
076e727b88 Finished 2.6 fixes 2012-02-04 15:22:51 -05:00
Bridger Maxwell
2a2bc9e315 Showing due dates and section types on profile page. 2012-02-04 12:45:46 -05:00
Piotr Mitros
a58ac22686 Copyright info 2012-02-03 18:58:21 -05:00
Piotr Mitros
1140dba4c4 privacy 2012-02-03 18:42:44 -05:00
Piotr Mitros
685775d5fc merge 2012-02-03 18:37:03 -05:00
Piotr Mitros
893dde182a Legal, calculator 2012-02-03 18:36:45 -05:00
Bridger Maxwell
96149cd639 Merge 2012-02-03 17:17:43 -05:00
Bridger Maxwell
eb31a163fa Added percentages to sections in profile 2012-02-03 17:17:04 -05:00
Bridger Maxwell
9c94ef9c68 Removed course overview graph, (course detail graph still remains). 2012-02-03 17:04:59 -05:00
Bridger Maxwell
4992be76c6 Added links from profile page back to courseware. This is also the last commit with the course overview graph enabled. It is about to be removed. 2012-02-03 17:03:24 -05:00
Piotr Mitros
9e906fc354 Help page works 2012-02-03 16:42:07 -05:00
Piotr Mitros
bd9cc58e37 Killed parallel 2012-02-03 16:17:14 -05:00
Bridger Maxwell
d5aa7532de Fixed graph bug that threw error if div didn't exist. 2012-02-03 14:53:53 -05:00
Ernie Park
40a6c55b5c merge 2012-02-02 18:51:39 -05:00
Ernie Park
34568e5bb0 update navigation and templates to include a class for nav so we can select currently active nav item 2012-02-02 18:50:58 -05:00
Bridger Maxwell
4be8c2358a Merged with profile changes again. Last time was backwards 2012-02-02 18:08:20 -05:00
Bridger Maxwell
ff6f7a5287 Changed flot to min library. IMPORTANT: UPDATE 3RD PARTY
--HG--
branch : profiledev
2012-02-02 17:57:00 -05:00
Bridger Maxwell
5bc671e40f Added section totals to profile page
--HG--
branch : profiledev
2012-02-02 17:53:34 -05:00
Bridger Maxwell
7d0e92d93e Merged in profile graphs to default
--HG--
branch : profiledev
2012-02-02 17:50:09 -05:00
Bridger Maxwell
621ab8ff94 Moved graph code to a seperate file
--HG--
branch : profiledev
2012-02-02 17:33:13 -05:00
Reda Lemeden
4cd963dc33 Merged with head 2012-02-02 17:23:45 -05:00
Reda Lemeden
8b1b716818 Redesigned the answer list. Answer controls (edit, delete, etc) still missing. 2012-02-02 17:23:12 -05:00
Kyle Fiedler
bdde1599c4 More edits to the profile page 2012-02-02 17:09:19 -05:00
Kyle Fiedler
1b0f03d722 Continued style on profile page 2012-02-02 16:32:46 -05:00
Bridger Maxwell
1c3f067736 Graph tweaks.
--HG--
branch : profiledev
2012-02-02 16:08:45 -05:00
Bridger Maxwell
a715068076 Labels and total percentage working for grade overview graph
--HG--
branch : profiledev
2012-02-02 15:16:47 -05:00
Bridger Maxwell
67d46c0792 Got grade overview graph drawing
--HG--
branch : profiledev
2012-02-02 14:32:33 -05:00
Kyle Fiedler
43f0f6c2be Merge 2012-02-02 14:20:49 -05:00
Kyle Fiedler
4dafe790df Added start to style for profile and course info 2012-02-02 14:20:27 -05:00
Reda Lemeden
f56e69ff0e Merged with head 2012-02-02 13:30:51 -05:00
Reda Lemeden
da17810d2d Fixed the layout of the question-specific comment section. 2012-02-02 13:30:15 -05:00
Kyle Fiedler
2458b52aa9 put video in overlay 2012-02-02 12:16:58 -05:00
Kyle Fiedler
dc0914e101 merge 2012-02-02 11:41:19 -05:00
Kyle Fiedler
5a246d1bd7 add video to mitx_global 2012-02-02 11:39:44 -05:00
Bridger Maxwell
a5f5af3b83 Got a basic, working graph of the scores
--HG--
branch : profiledev
2012-02-01 21:03:54 -05:00
Reda Lemeden
ed090ad880 Merged with headt 2012-02-01 18:09:26 -05:00
Reda Lemeden
5db3d4c5aa Re-skinned the top part of the question view 2012-02-01 18:08:27 -05:00