Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e0ad749166 Merged master Kyle Fiedler 2012-03-06 08:54:49 -05:00
  • d4b17006bd Resolve merge conflicts Reda Lemeden 2012-03-05 17:47:37 -05:00
  • 621943adef Restyled badges view and fixed Firefox button spacing issue in the askbot comments form Reda Lemeden 2012-03-05 17:45:41 -05:00
  • 129b42a0e0 Restyled badges view and fixed Firefox button spacing issue in the askbot comments form Reda Lemeden 2012-03-05 17:45:03 -05:00
  • 7284d43ef6 Made the time look more friendly Kyle Fiedler 2012-03-05 17:27:19 -05:00
  • a6ef534adb Merged with head Kyle Fiedler 2012-03-05 17:00:25 -05:00
  • 6291748bd3 Added red social icons to give them some more promenance Kyle Fiedler 2012-03-05 16:59:03 -05:00
  • 9d1a2a5c3f add active class to 1.0 speed video when page first loaded. Ernie Park 2012-03-05 15:53:07 -05:00
  • 09a1771bc0 merge Ernie Park 2012-03-05 15:44:58 -05:00
  • b660bab05e dont autoplay video on ios devices Ernie Park 2012-03-05 15:43:00 -05:00
  • b29ea7d3e2 Added styles for tutorials Kyle Fiedler 2012-03-05 14:58:31 -05:00
  • fe83eaef2f Styled wiki headers Reda Lemeden 2012-03-05 14:33:42 -05:00
  • 413950ca38 Restyled headers in the wiki articles Reda Lemeden 2012-03-05 14:30:45 -05:00
  • de61484ab3 Added smaller type for textbook Kyle Fiedler 2012-03-05 14:28:50 -05:00
  • 94313ef63a Added some more styles for highlighting the current speed Kyle Fiedler 2012-03-05 14:10:41 -05:00
  • 3778b73484 Merged with default Kyle Fiedler 2012-03-05 13:27:51 -05:00
  • cf71d90d9b merge default into branch Ernie Park 2012-03-05 12:09:18 -05:00
  • ece5dde5b5 merge Reda Lemeden 2012-03-05 11:59:55 -05:00
  • e5772237d2 Fixed question and answer styles Reda Lemeden 2012-03-05 11:59:31 -05:00
  • 465a52d93d Added style to answer and question content Reda Lemeden 2012-03-05 11:56:41 -05:00
  • a60cdf5d77 Removed letter-spacing from question titles Reda Lemeden 2012-03-05 11:12:42 -05:00
  • 9e42554c2b Better status when sending e-mails Piotr Mitros 2012-03-05 09:33:56 -05:00
  • 7d6a0af115 Emergency fallback if we need to stop the presses on bulk emails Piotr Mitros 2012-03-05 09:23:04 -05:00
  • a379ce365f Give number of e-mails sent Piotr Mitros 2012-03-05 09:09:21 -05:00
  • 4325437c31 Timestamps in log file for bulk emails Piotr Mitros 2012-03-05 09:04:23 -05:00
  • fe082d6248 Script to e-mail users in bulk, in batches, from a text file Piotr Mitros 2012-03-05 08:55:18 -05:00
  • 845063336f Welcome e-mails Piotr Mitros 2012-03-05 08:34:56 -05:00
  • d3fb6f7b80 Fixed profile graph template code. Now is clearly separated between python and javascript. Bridger Maxwell 2012-03-04 18:38:14 -05:00
  • 478372bd00 Bringing development branch back up to default Bridger Maxwell 2012-03-04 18:37:33 -05:00
  • cc13aef05a Check on user authenticated in AJAX Piotr Mitros 2012-03-04 14:21:52 -05:00
  • f27c16c87a Missed another spot Piotr Mitros 2012-03-04 14:09:14 -05:00
  • d1276e9af7 Missed a spot Piotr Mitros 2012-03-04 14:06:08 -05:00
  • b348f5d9b3 Cache toolbox disabled Piotr Mitros 2012-03-04 13:25:12 -05:00
  • 8ebb6273d9 Can't log in updated Piotr Mitros 2012-03-04 13:01:11 -05:00
  • 1ee30d28a4 No course credit Piotr Mitros 2012-03-04 12:53:31 -05:00
  • ecfd3ace07 Anant's better phrasing for video Piotr Mitros 2012-03-04 12:22:12 -05:00
  • bf7e40bf84 merge Piotr Mitros 2012-03-04 12:03:37 -05:00
  • 84e23af9f4 More self-help Piotr Mitros 2012-03-04 12:03:24 -05:00
  • 83eab20221 6002->6002x Piotr Mitros 2012-03-04 11:34:14 -05:00
  • 2c81042f99 Help text clarification Piotr Mitros 2012-03-04 10:46:44 -05:00
  • 6b35212615 Askbot jquery Piotr Mitros 2012-03-04 10:44:07 -05:00
  • a803b0f70f Merge Piotr Mitros 2012-03-04 10:17:43 -05:00
  • ad8969746d Remove info files, change Youtube to use https Piotr Mitros 2012-03-04 10:17:20 -05:00
  • 98f5a79dfc Disabled profile cache -- we ran into issues Piotr Mitros 2012-03-04 09:40:07 -05:00
  • cb24b17279 Changed the wiki titles to say 6.002x (they were missing the x) Bridger Maxwell 2012-03-03 23:49:51 -05:00
  • c636264196 Changed the wiki titles to say 6.002x (they were missing the x) Bridger Maxwell 2012-03-03 23:49:20 -05:00
  • 3a6bb0cd8b Properly logging Piotr Mitros 2012-03-03 19:21:03 -05:00
  • d321eb873a info files now referenced explicitly instead of symlink Piotr Mitros 2012-03-03 18:02:16 -05:00
  • 385a87c767 info files now referenced explicitly instead of symlink Piotr Mitros 2012-03-03 18:02:14 -05:00
  • b71ff07142 More info on browsers, redirect to /info Piotr Mitros 2012-03-03 17:39:22 -05:00
  • 5ae7334b38 Extract email list from DB Piotr Mitros 2012-03-03 15:46:28 -05:00
  • 04ebd38368 update tracking log to use pids David Ormsbee 2012-03-03 15:06:33 -05:00
  • 60312d927b switch tracking logs to go to local file David Ormsbee 2012-03-03 14:56:28 -05:00
  • 3d4e158782 Missed on file Piotr Mitros 2012-03-03 14:15:49 -05:00
  • 22748768ab Cache keys hashed, scripts to assign student to groups and send out bulk e-mails Piotr Mitros 2012-03-03 13:53:24 -05:00
  • 216e996982 Tracking now logs to a file including the pid instead of syslog Bridger Maxwell 2012-03-02 14:47:54 -05:00
  • 4b6681b348 Merged in default Bridger Maxwell 2012-03-02 14:44:05 -05:00
  • 407788f8ad Merge Jean-Michel Claus 2012-03-02 12:31:12 -05:00
  • 42ac1d0e12 Added missing file ocw-hw1.pdf Jean-Michel Claus 2012-03-02 12:06:27 -05:00
  • 0da6c6d6f9 regenerate marketing.css, there was a merge conflict that wasnt resolved previously Ernie Park 2012-03-02 11:13:52 -05:00
  • d456e6ec69 Symlink for html5 shiv as a short-term pre-ship workaround for a 404 Piotr Mitros 2012-03-01 19:09:07 -05:00
  • 8ff948a753 Highlight speed after clicked Kyle Fiedler 2012-03-01 17:41:07 -05:00
  • 8c3c33b7ac Fixed accordion on hidden courseware pages Bridger Maxwell 2012-03-01 17:12:39 -05:00
  • c4cebb4f15 Merge heads Kyle Fiedler 2012-03-01 16:23:39 -05:00
  • 6b5b3d5d7b Merge Reda Lemeden 2012-03-01 16:23:22 -05:00
  • 95a90a1a9f Merged in kf-profile-graph Kyle Fiedler 2012-03-01 16:23:04 -05:00
  • 021331054a merged with default Kyle Fiedler 2012-03-01 16:22:26 -05:00
  • d57c80b595 Wiki and Askbot bug fixes Reda Lemeden 2012-03-01 16:21:40 -05:00
  • 3f09848a05 Fixed article list width bug Reda Lemeden 2012-03-01 16:21:04 -05:00
  • 41488fa3af Merge Reda Lemeden 2012-03-01 15:48:22 -05:00
  • 9a109167ca Added badges styling Reda Lemeden 2012-03-01 15:47:56 -05:00
  • 4661404cc8 merge Ernie Park 2012-03-01 15:43:53 -05:00
  • 6b0655be55 prevent autoplay on iOS devices (which doesnt work anyway). fixes videos so user can click play and it'll play Ernie Park 2012-03-01 15:43:29 -05:00
  • 53c8c35bba Added styles for new ie warning Kyle Fiedler 2012-03-01 15:31:23 -05:00
  • 068e9eadec Adde new warning messages for userers IE8 and under Kyle Fiedler 2012-03-01 15:30:56 -05:00
  • 5b8f0205bc Minor adjustemnts to the topbar and Mathjax2 Kyle Fiedler 2012-03-01 14:27:47 -05:00
  • c1c4eabf27 Added fix for tootip styles and fixed top bar issues Kyle Fiedler 2012-03-01 13:40:30 -05:00
  • d3460a8ed2 Added fix for tooltips linehight Kyle Fiedler 2012-03-01 13:37:44 -05:00
  • c44c9851ed Merged heads Kyle Fiedler 2012-03-01 12:45:34 -05:00
  • f885cd85b6 Fix styles for topbar Kyle Fiedler 2012-03-01 12:45:17 -05:00
  • ad3fc40290 My last merge wasn't fast enough Bridger Maxwell 2012-03-01 12:33:49 -05:00
  • 7e64a746e0 Merge Bridger Maxwell 2012-03-01 12:26:09 -05:00
  • 4d53b370d7 Edited the simple wiki templates to allow for more flexibility in title markup + changed the layout of search results Reda Lemeden 2012-03-01 12:25:26 -05:00
  • 1987e8a29b tooltip lost styles Kyle Fiedler 2012-03-01 11:39:18 -05:00
  • f7996b58f8 added a fix for the wiki topbar Kyle Fiedler 2012-03-01 11:35:32 -05:00
  • 6446972d35 Merge Reda Lemeden 2012-03-01 10:06:37 -05:00
  • 682a167c65 Changed height and padding for wiki header Reda Lemeden 2012-03-01 10:00:12 -05:00
  • d60d689611 Merge performance fixes, and rename StudentModule.get_from_cache to get_with_caching David Ormsbee 2012-02-29 18:28:18 -05:00
  • 4c16563def Removed long comment; browser bug was rendering part of it Piotr Mitros 2012-02-29 17:25:14 -05:00
  • b4540a4803 Merge Piotr Mitros 2012-02-29 17:16:49 -05:00
  • cbfe2ae851 Fixed https link Piotr Mitros 2012-02-29 16:52:01 -05:00
  • 4520b15da9 Removed border from last course chapter in profile Reda Lemeden 2012-02-29 16:05:50 -05:00
  • 8b4979065d Added new styles and color for profile graph Kyle Fiedler 2012-02-29 15:50:29 -05:00
  • 4a734bf1b5 Fixed wiki history table and header alignment issues Reda Lemeden 2012-02-29 15:02:37 -05:00
  • 7f68610dac Error in case sensitivity. Applying patch from gjs' machine Piotr Mitros 2012-02-29 14:22:33 -05:00
  • 919cf9b1da Fixed minor alignment and baseline issues Reda Lemeden 2012-02-29 13:38:41 -05:00
  • 8bb11c52af Fixed sidebar and question list layout in smaller resolutions Reda Lemeden 2012-02-29 10:50:19 -05:00
  • d7fff54080 Removed date sorting and added question excerpts Reda Lemeden 2012-02-29 10:07:01 -05:00
  • 5942c13b39 Added Wiki navigation icons Reda Lemeden 2012-02-28 17:32:56 -05:00
  • 7363a2fba0 Merge Reda Lemeden 2012-02-28 17:30:12 -05:00