Commit Graph

644 Commits

Author SHA1 Message Date
Kyle Fiedler
ea7e006a38 merged default
--HG--
branch : kf-titles
2012-03-15 16:47:59 -04:00
Kyle Fiedler
3a84bafa48 merged in kf-links 2012-03-15 16:33:30 -04:00
Kyle Fiedler
057185f69e Merged in default
--HG--
branch : kf-links
2012-03-15 16:32:55 -04:00
Kyle Fiedler
3da8b8133f Added minor ui changes 2012-03-15 16:28:36 -04:00
Kyle Fiedler
e09310e9c9 added fix for error pages and for password reset page 2012-03-14 17:32:05 -04:00
Kyle Fiedler
3966a06888 Make warnings show in IE 9 2012-03-13 10:00:03 -04:00
Kyle Fiedler
2fc4477e44 Merged heads 2012-03-13 09:22:13 -04:00
Kyle Fiedler
731ca112bc Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update 2012-03-13 09:21:34 -04:00
Piotr Mitros
da8665204b Merged in gradebook 2012-03-12 18:52:04 -04:00
Kyle Fiedler
aac7cb090d AMerged default
--HG--
branch : kf-titles
2012-03-12 17:26:35 -04:00
Kyle Fiedler
d4a26f62f8 Added titles to the rest of the pages
--HG--
branch : kf-titles
2012-03-12 17:26:15 -04:00
Kyle Fiedler
4f1aedba0b Added titles to most of the pages
--HG--
branch : kf-titles
2012-03-12 17:20:13 -04:00
Reda Lemeden
d3c4c2eeeb Fixed id conflict in Askbot 2012-03-12 17:16:26 -04:00
Kyle Fiedler
0c783d19c3 Merged with default
--HG--
branch : kf-links
2012-03-12 17:05:12 -04:00
Kyle Fiedler
856a284c00 Fix bugs with link styles
--HG--
branch : kf-links
2012-03-12 17:04:49 -04:00
Reda Lemeden
3654c0339e Restyled the gradebook
--HG--
branch : rl-gradebook
2012-03-12 16:46:10 -04:00
Kyle Fiedler
d82cc563f4 added some styles for inline-links
--HG--
branch : kf-links
2012-03-12 14:01:17 -04:00
Piotr Mitros
7812b4a2c4 Added pi 2012-03-11 16:50:14 -04:00
Piotr Mitros
e2995a9e60 Basic gradebook 2012-03-10 22:31:58 -05:00
Piotr Mitros
103b764299 Textbook remembers last page 2012-03-09 20:50:20 -05:00
Piotr Mitros
c1d80eb369 Feedback form includes email and browser 2012-03-09 17:37:47 -05:00
Piotr Mitros
7b1f07498d Page numbers corrected 2012-03-09 17:08:11 -05:00
Reda Lemeden
0bbd840be7 Merge 2012-03-08 17:02:35 -05:00
Reda Lemeden
c2ae8c4184 Added styling for answers with accepted answer and unanswered questions 2012-03-08 17:02:02 -05:00
Kyle Fiedler
7bde9158fe Merged heads 2012-03-08 16:05:10 -05:00
Kyle Fiedler
d7296902ae Added styles for sliders in courseware 2012-03-08 16:01:00 -05:00
Ernie Park
ea1b2f981b merge 2012-03-08 14:50:20 -05:00
Ernie Park
690694f195 fix issue with saving video speed when video speeds are stored in different formats (with or without leading/trailing zeros) 2012-03-08 14:50:09 -05:00
Kyle Fiedler
8944cecd73 Merged with kf-sequence-nav 2012-03-08 14:47:39 -05:00
Kyle Fiedler
0600de354b Merged with default
--HG--
branch : kf-sequence-nav
2012-03-08 14:47:10 -05:00
Kyle Fiedler
2cd1b35324 Added styles and html for social links
--HG--
branch : kf-sequence-nav
2012-03-08 14:34:35 -05:00
Piotr Mitros
df15b6bd88 Merge 2012-03-08 13:13:21 -05:00
Kyle Fiedler
64a4afe8c0 Added some new styles for edit button and changed some of the wording 2012-03-07 21:28:20 -05:00
Piotr Mitros
6cbc7c9e7c Merge 2012-03-07 15:28:15 -05:00
Piotr Mitros
39c728cb0a Used cookies to store speed
--HG--
branch : ernie-templates-video-fixes
2012-03-07 15:27:34 -05:00
Kyle Fiedler
a4ad4a7dec Merged branches 2012-03-07 15:26:20 -05:00
Kyle Fiedler
3f3b349555 Added form and changes button to input so that users could hit enter on language and location 2012-03-07 15:25:41 -05:00
Reda Lemeden
318a9f2b5e Fixed visual bug in live suggestion dropdown 2012-03-07 11:18:16 -05:00
Ernie Park
6bbdae6f00 update video_init to use global video_speed variable to cue up same speed and make sure active class added to corrct speed
--HG--
branch : ernie-templates-video-fixes
2012-03-07 02:21:21 -05:00
Reda Lemeden
93a37c45c9 Small visual adjustment for official badges 2012-03-06 17:11:46 -05:00
Reda Lemeden
b7e385edd9 Made the official comment style apply to question comments as well 2012-03-06 16:20:56 -05:00
Reda Lemeden
3c8f64f51c Merge 2012-03-06 16:00:11 -05:00
Reda Lemeden
5772c4ca01 Added official badge styling 2012-03-06 15:59:33 -05:00
Bridger Maxwell
4ce2cfe523 Merge 2012-03-06 15:48:07 -05:00
Bridger Maxwell
5209a94200 Added revision feed, which shows latest edits across the wiki
--HG--
branch : bridger-dev
2012-03-06 15:25:48 -05:00
Kyle Fiedler
d4134b0a9e Added styles for the admin code in the courseware 2012-03-06 14:42:27 -05:00
Kyle Fiedler
8519f03bdb Added styles and js for disablling next and prev buttons
--HG--
branch : kf-sequence-nav
2012-03-06 14:22:22 -05:00
Kyle Fiedler
186fee6bf6 merged in kf-highlight-speed 2012-03-06 08:56:03 -05:00
Kyle Fiedler
e0ad749166 Merged master
--HG--
branch : kf-highlight-speed
2012-03-06 08:54:49 -05:00
Reda Lemeden
129b42a0e0 Restyled badges view and fixed Firefox button spacing issue in the askbot comments form 2012-03-05 17:45:03 -05:00