Commit Graph

  • cbfeb79eb6 Migration Piotr Mitros 2012-03-14 23:04:56 -04:00
  • 0ea176f665 Adding name and e-mail changes Piotr Mitros 2012-03-14 22:56:20 -04:00
  • d8b596148c Removed some accidental typing from gradebook.html Bridger Maxwell 2012-03-14 18:09:40 -04:00
  • a1f630470f Merged in default branch. Gradebook is now graphs with standard header/footer Bridger Maxwell 2012-03-14 18:03:46 -04:00
  • 98a4b48e3d Merged css Kyle Fiedler 2012-03-14 17:43:20 -04:00
  • d2b8a2c8ad New sass generated css Kyle Fiedler 2012-03-14 17:42:39 -04:00
  • b4f15d7c79 Added new styles for pages that are not inside the app or marketing Kyle Fiedler 2012-03-14 17:33:01 -04:00
  • e09310e9c9 added fix for error pages and for password reset page Kyle Fiedler 2012-03-14 17:32:05 -04:00
  • b2765395b1 Added some more markup and added styles for the email and profile changes Kyle Fiedler 2012-03-14 16:24:26 -04:00
  • 7c6a41b542 Edited html for the name, email and unenroll modal windows Kyle Fiedler 2012-03-14 14:14:48 -04:00
  • f4a71d9447 Minor update Piotr Mitros 2012-03-14 12:28:10 -04:00
  • f0cbbceaed Dialogs for name changes, etc. (non-working) Piotr Mitros 2012-03-14 12:27:12 -04:00
  • 7281cc50ed Name change branch created Piotr Mitros 2012-03-14 11:03:32 -04:00
  • 11f4820704 Minor change -- disable caching on DEV machines Piotr Mitros 2012-03-13 15:46:57 -04:00
  • 3966a06888 Make warnings show in IE 9 Kyle Fiedler 2012-03-13 10:00:03 -04:00
  • 2fc4477e44 Merged heads Kyle Fiedler 2012-03-13 09:22:13 -04:00
  • 731ca112bc Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update Kyle Fiedler 2012-03-13 09:21:34 -04:00
  • da8665204b Merged in gradebook Piotr Mitros 2012-03-12 18:52:04 -04:00
  • 3be5423b07 Small refactor on the grades. Also made the gradebook render a graph for each student Bridger Maxwell 2012-03-12 18:10:37 -04:00
  • 5b46112911 Small refactor on the grades. Also made the gradebook render a graph for each student Bridger Maxwell 2012-03-12 18:10:16 -04:00
  • ec4c1786cf Fixed askbot layout bug Reda Lemeden 2012-03-12 17:33:51 -04:00
  • aac7cb090d AMerged default Kyle Fiedler 2012-03-12 17:26:35 -04:00
  • d4a26f62f8 Added titles to the rest of the pages Kyle Fiedler 2012-03-12 17:26:15 -04:00
  • 4f1aedba0b Added titles to most of the pages Kyle Fiedler 2012-03-12 17:20:13 -04:00
  • d3c4c2eeeb Fixed id conflict in Askbot Reda Lemeden 2012-03-12 17:16:26 -04:00
  • 0c783d19c3 Merged with default Kyle Fiedler 2012-03-12 17:05:12 -04:00
  • 856a284c00 Fix bugs with link styles Kyle Fiedler 2012-03-12 17:04:49 -04:00
  • 3654c0339e Restyled the gradebook Reda Lemeden 2012-03-12 16:46:10 -04:00
  • d82cc563f4 added some styles for inline-links Kyle Fiedler 2012-03-12 14:01:17 -04:00
  • 12c3c4cc2d Extract complete user info into a json file Piotr Mitros 2012-03-11 20:26:57 -04:00
  • 4f4f3a75b5 merge Ernie Park 2012-03-11 17:45:56 -04:00
  • 7812b4a2c4 Added pi Piotr Mitros 2012-03-11 16:50:14 -04:00
  • 909aec4379 Better error messages Piotr Mitros 2012-03-10 22:45:00 -05:00
  • e8c7e5521b Better error message Piotr Mitros 2012-03-10 22:42:32 -05:00
  • e2995a9e60 Basic gradebook Piotr Mitros 2012-03-10 22:31:58 -05:00
  • 837b9c9075 Basic gradebook Piotr Mitros 2012-03-10 22:31:40 -05:00
  • af815abe3b Beginning refactoring grades out of profile view for use in gradebook Piotr Mitros 2012-03-10 21:17:22 -05:00
  • 2461669e6c Merged in functionality to show grades by student Piotr Mitros 2012-03-10 20:41:25 -05:00
  • f1ad393f18 Course admins can now access student grades by going to profile/[userid] Piotr Mitros 2012-03-10 20:34:13 -05:00
  • c7c71c9458 Merge Piotr Mitros 2012-03-10 20:17:13 -05:00
  • cde9ab284b Need to merge Piotr Mitros 2012-03-10 20:17:04 -05:00
  • a2c4010b8f Removed caching for dev machines Piotr Mitros 2012-03-10 20:13:03 -05:00
  • a8c2c3c5b4 More helpers Piotr Mitros 2012-03-10 19:38:51 -05:00
  • 6561cac242 User counts Piotr Mitros 2012-03-10 17:41:54 -05:00
  • 52dd6361e7 Helper methods for managing users Piotr Mitros 2012-03-10 17:33:20 -05:00
  • a995ef0f0f Instructors can see grades -- syncing machines -- nonworking code Piotr Mitros 2012-03-10 17:11:49 -05:00
  • 547bf5d52e Added book viewer Piotr Mitros 2012-03-10 17:10:49 -05:00
  • 103b764299 Textbook remembers last page Piotr Mitros 2012-03-09 20:50:20 -05:00
  • c8f261efc7 Work-around for not finding XML for sections in section files. Note: Requires data push Piotr Mitros 2012-03-09 20:20:02 -05:00
  • c1d80eb369 Feedback form includes email and browser Piotr Mitros 2012-03-09 17:37:47 -05:00
  • f8e706399f Feedback form includes email and browser Piotr Mitros 2012-03-09 17:37:45 -05:00
  • 7b1f07498d Page numbers corrected Piotr Mitros 2012-03-09 17:08:11 -05:00
  • 0bbd840be7 Merge Reda Lemeden 2012-03-08 17:02:35 -05:00
  • c2ae8c4184 Added styling for answers with accepted answer and unanswered questions Reda Lemeden 2012-03-08 17:02:02 -05:00
  • 7bde9158fe Merged heads Kyle Fiedler 2012-03-08 16:05:10 -05:00
  • 96fedc0cb6 Added image for sliders and styles for sliders Kyle Fiedler 2012-03-08 16:04:14 -05:00
  • d7296902ae Added styles for sliders in courseware Kyle Fiedler 2012-03-08 16:01:00 -05:00
  • ea1b2f981b merge Ernie Park 2012-03-08 14:50:20 -05:00
  • 690694f195 fix issue with saving video speed when video speeds are stored in different formats (with or without leading/trailing zeros) Ernie Park 2012-03-08 14:50:09 -05:00
  • e8656c2d9e merge Ernie Park 2012-03-08 14:49:40 -05:00
  • 513d811aec remove console.log lines Ernie Park 2012-03-08 14:49:28 -05:00
  • 8944cecd73 Merged with kf-sequence-nav Kyle Fiedler 2012-03-08 14:47:39 -05:00
  • 0600de354b Merged with default Kyle Fiedler 2012-03-08 14:47:10 -05:00
  • d9479bd33d Added images for real this time and fixed merge conflicts Kyle Fiedler 2012-03-08 14:36:32 -05:00
  • 16fdcd5700 Added images and css for social links in footer Kyle Fiedler 2012-03-08 14:35:25 -05:00
  • 2cd1b35324 Added styles and html for social links Kyle Fiedler 2012-03-08 14:34:35 -05:00
  • 814f743c37 merge away detritus from static's default David Ormsbee 2012-03-08 13:30:02 -05:00
  • df15b6bd88 Merge Piotr Mitros 2012-03-08 13:13:21 -05:00
  • 64a4afe8c0 Added some new styles for edit button and changed some of the wording Kyle Fiedler 2012-03-07 21:28:20 -05:00
  • c991190c02 Merge Piotr Mitros 2012-03-07 15:30:48 -05:00
  • 6cbc7c9e7c Merge Piotr Mitros 2012-03-07 15:28:15 -05:00
  • 5db419d211 Used cookies to store speed Piotr Mitros 2012-03-07 15:27:47 -05:00
  • 39c728cb0a Used cookies to store speed Piotr Mitros 2012-03-07 15:27:34 -05:00
  • a4ad4a7dec Merged branches Kyle Fiedler 2012-03-07 15:26:20 -05:00
  • 3f3b349555 Added form and changes button to input so that users could hit enter on language and location Kyle Fiedler 2012-03-07 15:25:41 -05:00
  • 90a70e661f include kyles changes to bold the video speed Ernie Park 2012-03-07 14:52:01 -05:00
  • 318a9f2b5e Fixed visual bug in live suggestion dropdown Reda Lemeden 2012-03-07 11:18:16 -05:00
  • 40e52cb96e update video player to accommodate remembering video speeds when switching in sequences and fix bug where play button gets out of sync when switching speeds Ernie Park 2012-03-07 02:25:33 -05:00
  • 6bbdae6f00 update video_init to use global video_speed variable to cue up same speed and make sure active class added to corrct speed Ernie Park 2012-03-07 02:21:21 -05:00
  • 174f50c575 Small visual adjustment for official badges Reda Lemeden 2012-03-06 17:15:59 -05:00
  • 93a37c45c9 Small visual adjustment for official badges Reda Lemeden 2012-03-06 17:11:46 -05:00
  • 5baddf5366 Made the official comment style apply to question comments as well Reda Lemeden 2012-03-06 16:21:26 -05:00
  • b7e385edd9 Made the official comment style apply to question comments as well Reda Lemeden 2012-03-06 16:20:56 -05:00
  • dfc96ba273 Merge and resolve conflict Reda Lemeden 2012-03-06 16:07:10 -05:00
  • 97b2a05f1b Added official badge styling for Askbot Reda Lemeden 2012-03-06 16:01:15 -05:00
  • 3c8f64f51c Merge Reda Lemeden 2012-03-06 16:00:11 -05:00
  • 5772c4ca01 Added official badge styling Reda Lemeden 2012-03-06 15:59:33 -05:00
  • 4ce2cfe523 Merge Bridger Maxwell 2012-03-06 15:48:07 -05:00
  • 7e640e3965 Merge Bridger Maxwell 2012-03-06 15:47:46 -05:00
  • 84471d176e Added revision feed, which shows latest edits across the wiki. Also brought down wiki queries using select_related and caching article slugs Bridger Maxwell 2012-03-06 15:26:34 -05:00
  • 5209a94200 Added revision feed, which shows latest edits across the wiki Bridger Maxwell 2012-03-06 15:25:48 -05:00
  • 6926bb9309 Merged heads and resolved conflict Kyle Fiedler 2012-03-06 14:44:19 -05:00
  • 2081680588 Added styles for the admin code in courseware Kyle Fiedler 2012-03-06 14:42:56 -05:00
  • d4134b0a9e Added styles for the admin code in the courseware Kyle Fiedler 2012-03-06 14:42:27 -05:00
  • 8519f03bdb Added styles and js for disablling next and prev buttons Kyle Fiedler 2012-03-06 14:22:22 -05:00
  • f58f08edbe Changed hoverling labels of profile graph to give real name of homework or lab section Bridger Maxwell 2012-03-06 12:53:39 -05:00
  • 2c5bd99f93 Caught up to default branch Bridger Maxwell 2012-03-06 12:35:48 -05:00
  • ccacc90ca7 Don't allow posting before logging in. David Ormsbee 2012-03-06 11:44:26 -05:00
  • 299e1ae905 fixed it so staff can immediately accept answers David Ormsbee 2012-03-06 10:55:45 -05:00
  • 186fee6bf6 merged in kf-highlight-speed Kyle Fiedler 2012-03-06 08:56:03 -05:00